Add error message for properties who's key is not a string

bioclipse · Aug 30, 2013 · 6facb74 · 6facb74
1 parent 767a96b
commit 6facb74
Showing 1 changed file with 8 additions and 3 deletions.
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
@@ -147,8 +147,11 @@ else if(newInput instanceof IAdaptable){
         properties.clear();
         Iterator<Object> iter = getAvailableProperties().iterator();
         for(int i=0;i<NUMBER_OF_PROPERTIES;i++) {
-            if(iter.hasNext())
-                properties.add(iter.next());
+            if ( iter.hasNext() ) {
+                Object o = iter.next();
+                if ( o instanceof String )
+                    properties.add( iter.next() );
+            }
         }
         updateHeaders();
         moleculeProperties.clear();
@@ -273,7 +276,7 @@ public Object getDataValue( final int col, final int row ) {
         }
         if ( executorService == null ) initExecutorService();
 
-        String propertyName = col==0?null:(String) properties.get( i );
+        String propertyName = col == 0 ? null : properties.get( i ).toString();
         String propertyKey = PropertyOrder.createPropertyKey( propertyName, 
                                                               row);
         Future<Object> p = moleculeProperties.get( propertyKey );
@@ -306,6 +309,8 @@ public Object getDataValue( final int col, final int row ) {
                 }
             }
         }
+        if ( p == null )
+            return "[Not suported]";
         return "[ Loading... ]";
     }