Author: kono
Date: 2010-08-03 18:47:20 -0700 (Tue, 03 Aug 2010)
New Revision: 21178
Modified:
core3/vizmap-gui-impl/trunk/pom.xml
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
Log:
Dependencies are optimized. Libraries should be updated later.
Modified: core3/vizmap-gui-impl/trunk/pom.xml
===================================================================
--- core3/vizmap-gui-impl/trunk/pom.xml 2010-08-04 01:21:45 UTC (rev 21177)
+++ core3/vizmap-gui-impl/trunk/pom.xml 2010-08-04 01:47:20 UTC (rev 21178)
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
+
<version>${maven-bundle-plugin.version}</version>
<!--
| the following instructions build a
simple set of public/private
classes into an OSGi bundle
@@ -81,31 +81,17 @@
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>viewmodel-api</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>vizmap-api</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>default-mappings</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+
<dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>session-api</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>cytoscape</groupId>
<artifactId>application</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
- <!-- Wrapped libraries -->
+ <!-- Wrapped 3rd party libraries -->
<dependency>
<groupId>org.cytoscape.wrappers</groupId>
<artifactId>com.l2fprod.common.sheet</artifactId>
@@ -113,11 +99,6 @@
</dependency>
<dependency>
<groupId>org.cytoscape.wrappers</groupId>
- <artifactId>org.swinglabs.swingx</artifactId>
- <version>0.9.7</version>
- </dependency>
- <dependency>
- <groupId>org.cytoscape.wrappers</groupId>
<artifactId>com.l2fprod.common.shared</artifactId>
<version>7.3</version>
</dependency>
@@ -128,10 +109,10 @@
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>2.5.6</version>
- <scope>provided</scope>
+ <groupId>org.cytoscape.wrappers</groupId>
+ <artifactId>org.swinglabs.swingx</artifactId>
+ <version>0.9.7</version>
+ <type>bundle</type>
</dependency>
</dependencies>
</project>
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
2010-08-04 01:21:45 UTC (rev 21177)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
2010-08-04 01:47:20 UTC (rev 21178)
@@ -66,9 +66,9 @@
import org.cytoscape.view.vizmap.gui.VizMapGUI;
import org.cytoscape.view.vizmap.gui.action.VizMapUIAction;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
+import org.cytoscape.view.vizmap.gui.event.SelectedVisualStyleSwitchedEvent;
import org.cytoscape.view.vizmap.gui.event.VizMapEventHandlerManager;
import
org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor.AttributeComboBoxPropertyEditor;
-import org.cytoscape.view.vizmap.gui.event.SelectedVisualStyleSwitchedEvent;
import org.cytoscape.view.vizmap.gui.internal.theme.ColorManager;
import org.cytoscape.view.vizmap.gui.internal.theme.IconManager;
import org.cytoscape.view.vizmap.gui.internal.util.VizMapperUtil;
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2010-08-04 01:21:45 UTC (rev 21177)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2010-08-04 01:47:20 UTC (rev 21178)
@@ -81,6 +81,7 @@
import org.cytoscape.view.vizmap.gui.event.SelectedVisualStyleSwitchedEvent;
import org.cytoscape.view.vizmap.gui.event.SelectedVisualStyleSwitchedListener;
import org.jdesktop.swingx.JXList;
+import org.jdesktop.swingx.JXPanel;
import org.jdesktop.swingx.border.DropShadowBorder;
/**
@@ -226,7 +227,7 @@
// <editor-fold defaultstate="collapsed" desc=" Generated Code ">
private void initComponents() {
- jXPanel1 = new org.jdesktop.swingx.JXPanel();
+ jXPanel1 = new JXPanel();
jXTitledPanel1 = new org.jdesktop.swingx.JXTitledPanel();
defaultObjectTabbedPane = new javax.swing.JTabbedPane();
nodeScrollPane = new javax.swing.JScrollPane();
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
