Merge pull request #2643 from Mailaender/molecule-service-ranking

Allow prioritizing of the molecule image service

Author: eselmeister

chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/Activator.java

@@ -112,6 +112,11 @@ public DataUpdateSupport getDataUpdateSupport() {
 		return dataUpdateSupport;
 	}
 
+	public IMoleculeImageService getMoleculeImageService() {
+
+		return moleculeImageServiceTracker.getService();
+	}
+
 	public Object[] getMoleculeImageServices() {
 
 		return moleculeImageServiceTracker.getServices();

chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/support/MoleculeImageServiceSupport.java

@@ -37,7 +37,7 @@ public static Object[] getMoleculeImageServices() {
 
 	public static IMoleculeImageService getMoleculeImageServiceSelection() {
 
-		return getMoleculeImageServiceSelection(getMoleculeImageServices());
+		return Activator.getDefault().getMoleculeImageService();
 	}
 
 	public static IMoleculeImageService getMoleculeImageServiceSelection(Object[] moleculeImageServices) {
@@ -99,7 +99,7 @@ public String getText(Object element) {
 
 		if(moleculeImageServices != null) {
 			comboViewer.setInput(moleculeImageServices);
-			moleculeImageService = MoleculeImageServiceSupport.getMoleculeImageServiceSelection(moleculeImageServices);
+			moleculeImageService = MoleculeImageServiceSupport.getMoleculeImageServiceSelection();
 			if(moleculeImageService != null) {
 				comboViewer.setSelection(new StructuredSelection(moleculeImageService));
 			}