r27973 - in core3/api/trunk/work-api/src: main/java/org/cytoscape/work test/java/org/cytoscape/work

[cytoscape-noreply27]

Author: mes
Date: 2012-01-10 15:48:10 -0800 (Tue, 10 Jan 2012)
New Revision: 27973

Modified:
   
core3/api/trunk/work-api/src/main/java/org/cytoscape/work/AbstractTunableInterceptor.java
   
core3/api/trunk/work-api/src/test/java/org/cytoscape/work/AbstractTunableInterceptorTest.java
Log:
removed swing import so that this code should work in a non-gui context

Modified: 
core3/api/trunk/work-api/src/main/java/org/cytoscape/work/AbstractTunableInterceptor.java
===================================================================
--- 
core3/api/trunk/work-api/src/main/java/org/cytoscape/work/AbstractTunableInterceptor.java
   2012-01-10 23:37:03 UTC (rev 27972)
+++ 
core3/api/trunk/work-api/src/main/java/org/cytoscape/work/AbstractTunableInterceptor.java
   2012-01-10 23:48:10 UTC (rev 27973)
@@ -38,8 +38,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.swing.JPanel;
-
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
 
@@ -199,7 +197,8 @@
        private boolean isJPanelOrJPanelDescendent(final Class c) {
                Class c0 = c;
                while (c0 != null && c0 != Object.class) {
-                       if (c0 == JPanel.class)
+                       // hack so that we don't need to import swing
+                       if (c0.getName().equals( "javax.swing.JPanel" ))
                                return true;
                        c0 = c0.getSuperclass();
                }

Modified: 
core3/api/trunk/work-api/src/test/java/org/cytoscape/work/AbstractTunableInterceptorTest.java
===================================================================
--- 
core3/api/trunk/work-api/src/test/java/org/cytoscape/work/AbstractTunableInterceptorTest.java
       2012-01-10 23:37:03 UTC (rev 27972)
+++ 
core3/api/trunk/work-api/src/test/java/org/cytoscape/work/AbstractTunableInterceptorTest.java
       2012-01-10 23:48:10 UTC (rev 27973)
@@ -103,6 +103,11 @@
        }
 
        @Test(expected=IllegalArgumentException.class)
+       public final void testInvalidProvidesGUIReturnType2() {
+               interceptor.loadTunables(new HasInvalidProvidesGUIMethod2());
+       }
+
+       @Test(expected=IllegalArgumentException.class)
        public final void testInvalidProvidesGUIMethodWithArg() {
                interceptor.loadTunables(new 
HasInvalidProvidesGUIMethodWithArg());
        }
@@ -207,7 +212,12 @@
        public void badReturnType() { }
 }
 
+class HasInvalidProvidesGUIMethod2 {
+       @ProvidesGUI
+       public Double badReturnType() { return null; }
+}
 
+
 class HasInvalidProvidesGUIMethodWithArg {
        @ProvidesGUI
        public JPanel bad(int i) { return null; }

-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To post to this group, send email to cytoscape-cvs@googlegroups.com.
To unsubscribe from this group, send email to 
cytoscape-cvs+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/cytoscape-cvs?hl=en.