Added getAvaiableProperties() to IMoleculesEdiotrModel

egonw · Oct 2, 2009 · 8458bd6 · 8458bd6
1 parent 7d41951
commit 8458bd6
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 15 deletions.
diff --git a/...se.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/business/MoleculeTableManager.java b/...se.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/business/MoleculeTableManager.java
@@ -289,8 +289,7 @@ private SDFIndexEditorModel saveSDF(IMoleculesEditorModel model, IFile file,
 
         IFile target = null;
         Collection<Object> availableProperties = null;
-        if(model instanceof SDFIndexEditorModel) // FIXME save properties to sDB
-            availableProperties = ((SDFIndexEditorModel) model).getPropertyKeys();
+            availableProperties = model.getAvailableProperties();
 
         SubMonitor loopProgress = subMonitor.newChild( 1000 );
         loopProgress.setWorkRemaining( 1000*model.getNumberOfMolecules() );

diff --git a/....ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/MoleculeTableContentProvider.java b/....ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/MoleculeTableContentProvider.java
@@ -12,7 +12,6 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -57,9 +56,7 @@ public List<Object> getProperties() {
     }
 
     public Collection<Object> getAvailableProperties() {
-        if(model instanceof SDFIndexEditorModel)
-            return ((SDFIndexEditorModel)model).getPropertyKeys();
-        return Collections.emptySet();
+        return model.getAvailableProperties();
     }
 
     public void removeColumn(Object key) {

diff --git a/...lipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/MoleculeTableViewer.java b/...lipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/MoleculeTableViewer.java
@@ -10,6 +10,7 @@
  ******************************************************************************/
 package net.bioclipse.cdk.ui.sdfeditor.editor;
 
+import java.util.Collection;
 import java.util.List;
 
 import net.bioclipse.cdk.domain.CDKMolecule;
@@ -275,7 +276,10 @@ public void markDirty( int index,
                     public void save() {
                         throw new UnsupportedOperationException();
                     }
+                    public Collection<Object> getAvailableProperties() {
 
+                        return model.getAvailableProperties();
+                    }
                 };
                 return editorModel;
             }
@@ -289,7 +293,6 @@ public ISelection getSelection() {
         if(getContentProvider() instanceof MoleculeTableContentProvider) {
 
             int[] selected = table.getSelectionModel().getSelectedRows();
-            int max = getDataProvider().getRowCount();
 
             if(selected.length==0) {
                 currentSelected = -1;

diff --git a/...bioclipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/MoleculesEditor.java b/...bioclipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/MoleculesEditor.java
@@ -14,6 +14,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -222,6 +223,14 @@ public void markDirty(
                                         public void save() {
                                             throw new UnsupportedOperationException();
                                             }
+                                        public Collection<Object> getAvailableProperties() {
+
+                                            return new ArrayList<Object>(
+                                                            molecules.get( 0 )
+                                                            .getAtomContainer()
+                                                            .getProperties()
+                                                            .keySet());
+                                        }
                                     };
 
 
@@ -296,6 +305,14 @@ public void markDirty( int index,
 
                             public void save() {
                                 }
+                            public Collection<Object> getAvailableProperties() {
+
+                                return new ArrayList<Object>(
+                                                molecules.get( 0 )
+                                                .getAtomContainer()
+                                                .getProperties()
+                                                .keySet());
+                            }
                         };
 
                   molTableViewer.setContentProvider(

diff --git a/....ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/MultiPageMoleculesEditorPart.java b/....ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/MultiPageMoleculesEditorPart.java
@@ -273,13 +273,12 @@ private void calculateProperties(ICDKMolecule molecule) {
         Collection<IPropertyCalculator<?>> calculators = CalculatePropertyHandler
         .gatherCalculators( CalculatePropertyHandler
                             .getConfigurationElements(), null );
-        if(moleculesPage.getModel() instanceof SDFIndexEditorModel) {
-            Collection<Object> idsx = ((SDFIndexEditorModel)moleculesPage.getModel())
-                .getPropertyKeys();
-            for(IPropertyCalculator<?> calculator:calculators) {
-                if( idsx.contains( calculator.getPropertyName() )) {
-                   ids.add( calculator );
-                }
+
+        Collection<Object> idsx =
+                        moleculesPage.getModel().getAvailableProperties();
+        for ( IPropertyCalculator<?> calculator : calculators ) {
+            if ( idsx.contains( calculator.getPropertyName() ) ) {
+                ids.add( calculator );
             }
         }
 

diff --git a/...lipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/SDFIndexEditorModel.java b/...lipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/SDFIndexEditorModel.java
@@ -249,7 +249,7 @@ private void readProperties(ICDKMolecule molecule) {
         }
     }
 
-    public Collection<Object> getPropertyKeys() {
+    public Collection<Object> getAvailableProperties() {
         if(availableProperties==null) return Collections.emptySet();
         availableProperties.addAll( propertyList.keySet() );
         return new HashSet<Object>(availableProperties);

diff --git a/plugins/net.bioclipse.cdk.ui/src/net/bioclipse/cdk/ui/model/MoleculesFromSDF.java b/plugins/net.bioclipse.cdk.ui/src/net/bioclipse/cdk/ui/model/MoleculesFromSDF.java
@@ -12,6 +12,7 @@
 package net.bioclipse.cdk.ui.model;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -150,4 +151,8 @@ public void save() {
         throw new UnsupportedOperationException(this.getClass().getName()+
         " does not support this operation yet");
     }
+
+    public Collection<Object> getAvailableProperties() {
+        return Collections.emptySet();
+    }
 }
diff --git a/plugins/net.bioclipse.cdk.ui/src/net/bioclipse/cdk/ui/model/MoleculesFromSMI.java b/plugins/net.bioclipse.cdk.ui/src/net/bioclipse/cdk/ui/model/MoleculesFromSMI.java
@@ -11,6 +11,7 @@
 package net.bioclipse.cdk.ui.model;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -125,4 +126,8 @@ public void save() {
 
          throw new UnsupportedOperationException("Can't save SMILES yet.");
     }
+
+     public Collection<Object> getAvailableProperties() {
+         return Collections.emptySet();
+    }
 }
diff --git a/plugins/net.bioclipse.cdk.ui/src/net/bioclipse/cdk/ui/views/IMoleculesEditorModel.java b/plugins/net.bioclipse.cdk.ui/src/net/bioclipse/cdk/ui/views/IMoleculesEditorModel.java
@@ -11,6 +11,8 @@
  ******************************************************************************/
 package net.bioclipse.cdk.ui.views;
 
+import java.util.Collection;
+
 import net.bioclipse.cdk.domain.ICDKMolecule;
 
 /**
@@ -26,4 +28,6 @@ public interface IMoleculesEditorModel {
     public void markDirty(int index,ICDKMolecule moleculeToSave);
 
     public void save();
+
+    public Collection<Object> getAvailableProperties();
 }