Merge pull request #680 from EclipseNebula/feature/Issue_671_Search_option_under_Multichoice_widget

Issue 671 - Search option under Multichoice widget

Author: lcaron

widgets/opal/multichoice/org.eclipse.nebula.widgets.opal.multichoice.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.nebula.widgets.opal.multichoice.feature"
       label="Nebula Opal Multichoice Widget"
-      version="1.0.0.qualifier"
+      version="1.1.0.qualifier"
       provider-name="Eclipse Nebula">
 
    <description url="http://eclipse.org/nebula">
@@ -16,18 +16,13 @@
    <requires>
       <import feature="org.eclipse.nebula.widgets.opal.commons.feature"/>
    </requires>
-   
+
    <plugin
          id="org.eclipse.nebula.widgets.opal.multichoice"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.nebula.widgets.opal.multichoice.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
+
 </feature>

widgets/opal/multichoice/org.eclipse.nebula.widgets.opal.multichoice.feature/pom.xml

@@ -19,13 +19,12 @@ Contributors:
 	<parent>
 		<groupId>org.eclipse.nebula</groupId>
 		<artifactId>multichoice</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.nebula.widgets.opal.multichoice.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 
 	<name>Multichoice Feature</name>
-	<version>1.0.0-SNAPSHOT</version>
 
 </project>

widgets/opal/multichoice/org.eclipse.nebula.widgets.opal.multichoice.snippets/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nebula Opal Multichoice Snippets
 Bundle-SymbolicName: org.eclipse.nebula.widgets.opal.multichoice.snippets
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: Eclipse Nebula
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.nebula.widgets.opal.multichoice;bundle-version="1.0.0",

widgets/opal/multichoice/org.eclipse.nebula.widgets.opal.multichoice.snippets/pom.xml

@@ -15,7 +15,7 @@ http://www.eclipse.org/legal/epl-v10.html
 	<parent>
 		<groupId>org.eclipse.nebula</groupId>
 		<artifactId>multichoice</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.nebula.widgets.opal.multichoice.snippets</artifactId>

widgets/opal/multichoice/org.eclipse.nebula.widgets.opal.multichoice.snippets/src/org/eclipse/nebula/widgets/opal/multichoice/snippets/MultiChoiceSnippet.java

@@ -38,7 +38,9 @@ public static void main(final String[] args) {
 		shell.setText("MultiChoice Example");
 
 		// Data
-		final String[] euroZone = new String[] { "Austria", "Belgium", "Cyprus", "Estonia", "Finland", "France", "Germany", "Greece", "Ireland", "Italy", "Luxembourg", "Malta", "Netherlands", "Portugal", "Slovakia", "Slovenia", "Spain" };
+		final String[] euroZone = new String[] { "Austria", "Belgium", "Cyprus", "Estonia", "Finland", "France",
+				"Germany", "Greece", "Ireland", "Italy", "Luxembourg", "Malta", "Netherlands", "Portugal", "Slovakia",
+				"Slovenia", "Spain" };
 
 		final List<Country> membersOfEuropeanUnion = new ArrayList<>();
 		membersOfEuropeanUnion.add(new Country("Austria", 8372930));
@@ -84,7 +86,7 @@ public static void main(final String[] args) {
 		countryCodes.add(new Country("Spain", "ES"));
 		countryCodes.add(new Country("Portugal", "PT"));
 
-		// Draw the window
+		// Fill the content of the window
 		drawLabel(shell, "Simple Multichoice :");
 		final MultiChoice<String> mcSimple = new MultiChoice<>(shell, SWT.READ_ONLY);
 		mcSimple.setEditable(false);
@@ -114,10 +116,11 @@ public static void main(final String[] args) {
 		drawLabel(shell, "Selection listener :");
 		final MultiChoice<Country> mcSL = new MultiChoice<>(shell, SWT.READ_ONLY);
 		mcSL.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, true));
-		mcSL.setSelectionListener(new MultiChoiceSelectionListener<Country>(mcSL) {
+		mcSL.setSelectionListener(new MultiChoiceSelectionListener<>(mcSL) {
 
 			@Override
-			public void handle(final MultiChoice<Country> parent, final Country receiver, final boolean selection, final Shell popup) {
+			public void handle(final MultiChoice<Country> parent, final Country receiver, final boolean selection,
+					final Shell popup) {
 				if ("Select All".equals(receiver.toString())) {
 					if (selection) {
 						parent.deselectAll();
@@ -184,7 +187,6 @@ public void handle(final MultiChoice<Country> parent, final Country receiver, fi
 		mcNotEditable.setEditable(false);
 		addButons(mcNotEditable);
 
-
 		drawLabel(shell, "Not Enabled Multichoice :");
 		final MultiChoice<String> mcNotEnabled = new MultiChoice<>(shell, SWT.READ_ONLY);
 		final GridData gridDataNotEnabled = new GridData(GridData.FILL, GridData.BEGINNING, true, true);
@@ -194,7 +196,16 @@ public void handle(final MultiChoice<Country> parent, final Country receiver, fi
 		mcNotEnabled.setEditable(false);
 		addButons(mcNotEnabled);
 
-		// display the shell...
+		drawLabel(shell, "Multichoice with search panel :");
+		final MultiChoice<String> mcSearch = new MultiChoice<>(shell, SWT.READ_ONLY | SWT.SEARCH);
+		mcSearch.setEditable(false);
+		final GridData gridDataMcSearch = new GridData(GridData.FILL, GridData.BEGINNING, true, true);
+		gridDataMcSearch.widthHint = 200;
+		mcSearch.setLayoutData(gridDataMcSearch);
+		mcSearch.addAll(euroZone);
+		addButons(mcSearch);
+
+		// Open the shell
 		shell.open();
 		shell.pack();
 		while (!shell.isDisposed()) {

widgets/opal/multichoice/org.eclipse.nebula.widgets.opal.multichoice/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nebula Opal Multichoice
 Bundle-SymbolicName: org.eclipse.nebula.widgets.opal.multichoice
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: Eclipse Nebula
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.nebula.widgets.opal.commons;bundle-version="1.0.0";visibility:=reexport,

widgets/opal/multichoice/org.eclipse.nebula.widgets.opal.multichoice/pom.xml

@@ -15,7 +15,7 @@ http://www.eclipse.org/legal/epl-v10.html
 	<parent>
 		<groupId>org.eclipse.nebula</groupId>
 		<artifactId>multichoice</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.nebula.widgets.opal.multichoice</artifactId>