Author: mes
Date: 2010-11-10 14:34:22 -0800 (Wed, 10 Nov 2010)
New Revision: 22810
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/VizMapperMainPanel.java
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
Log:
now registering vizmapper as CytoPanelComponent
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-11-10 22:33:35 UTC (rev 22809)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
2010-11-10 22:34:22 UTC (rev 22810)
@@ -55,7 +55,6 @@
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.session.CyApplicationManager;
-import org.cytoscape.view.CySwingApplication;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.VisualStyleFactory;
@@ -116,9 +115,6 @@
protected CyEventHelper eventHelper;
- // Cytoscape Desktop Application Frame.
- protected CySwingApplication cytoscapeDesktop;
-
protected VisualMappingManager vmm;
protected ColorManager colorMgr;
@@ -166,7 +162,7 @@
protected static final long serialVersionUID = -6839011300709287662L;
public AbstractVizMapperPanel(final VisualStyleFactory vsFactory,
- CySwingApplication desktop, DefaultViewEditor
defViewEditor,
+ DefaultViewEditor defViewEditor,
IconManager iconMgr, ColorManager colorMgr,
VisualMappingManager vmm, VizMapperMenuManager menuMgr,
EditorManager editorFactory, PropertySheetPanel
propertySheetPanel,
@@ -177,7 +173,6 @@
this.manager = manager;
this.vsFactory = vsFactory;
- this.cytoscapeDesktop = desktop;
this.defViewEditor = defViewEditor;
this.iconMgr = iconMgr;
this.colorMgr = colorMgr;
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2010-11-10 22:33:35 UTC (rev 22809)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2010-11-10 22:34:22 UTC (rev 22810)
@@ -41,6 +41,7 @@
import java.util.Map;
import java.util.TreeMap;
+import javax.swing.Icon;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JPanel;
@@ -52,8 +53,8 @@
import org.cytoscape.model.events.NetworkAddedEvent;
import org.cytoscape.model.events.NetworkAddedListener;
import org.cytoscape.session.CyApplicationManager;
-import org.cytoscape.view.CySwingApplication;
import org.cytoscape.view.CytoPanelName;
+import org.cytoscape.view.CytoPanelComponent;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.model.events.NetworkViewAddedEvent;
@@ -96,7 +97,7 @@
* @param <syncronized>
*/
public class VizMapperMainPanel extends AbstractVizMapperPanel implements
- VisualStyleAddedListener, VisualStyleAboutToBeRemovedListener,
PopupMenuListener, NetworkViewAddedListener, NetworkAddedListener {
+ VisualStyleAddedListener, VisualStyleAboutToBeRemovedListener,
PopupMenuListener, NetworkViewAddedListener, NetworkAddedListener,
CytoPanelComponent {
private final static long serialVersionUID = 1202339867854959L;
@@ -112,7 +113,6 @@
* Create new instance of VizMapperMainPanel object. GUI layout is
handled
* by abstract class.
*
- * @param desktop
* @param dab
* @param iconMgr
* @param colorMgr
@@ -122,7 +122,6 @@
*/
public VizMapperMainPanel(
final VisualStyleFactory vsFactory,
- final CySwingApplication desktop,
DefaultViewEditor defViewEditor, IconManager iconMgr,
ColorManager colorMgr, VisualMappingManager vmm,
VizMapperMenuManager menuMgr, EditorManager
editorFactory,
@@ -132,7 +131,7 @@
CyApplicationManager applicationManager, CyEventHelper
eventHelper,
final SelectedVisualStyleManager manager) {
- super(vsFactory, desktop, defViewEditor, iconMgr, colorMgr,
vmm, menuMgr,
+ super(vsFactory, defViewEditor, iconMgr, colorMgr, vmm, menuMgr,
editorFactory, propertySheetPanel,
vizMapPropertySheetBuilder,
editorWindowManager,
applicationManager, eventHelper, manager);
@@ -153,8 +152,6 @@
refreshUI();
-
cytoscapeDesktop.getCytoPanel(CytoPanelName.WEST).add(TAB_TITLE, this);
-
// Switch to the default style.
switchVS(manager.getDefaultStyle());
}
@@ -734,4 +731,20 @@
if (view != null)
vmm.setVisualStyle(defaultStyle, view);
}
+
+ public String getTitle() {
+ return TAB_TITLE;
+ }
+
+ public CytoPanelName getCytoPanelName() {
+ return CytoPanelName.WEST;
+ }
+
+ public Component getComponent() {
+ return this;
+ }
+
+ public Icon getIcon() {
+ return null;
+ }
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
2010-11-10 22:33:35 UTC (rev 22809)
+++
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
2010-11-10 22:34:22 UTC (rev 22810)
@@ -59,10 +59,6 @@
interface="org.cytoscape.view.presentation.RenderingEngineFactory"
filter="(id=ding)" />
- <!-- Import Desktop Service -->
- <osgi:reference id="cytoscapeDesktopServiceRef"
- interface="org.cytoscape.view.CySwingApplication" />
-
<!-- Visual Mapping Manager Service -->
<osgi:reference id="vmmServiceRef"
interface="org.cytoscape.view.vizmap.VisualMappingManager" />
Modified:
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
2010-11-10 22:33:35 UTC (rev 22809)
+++
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
2010-11-10 22:34:22 UTC (rev 22810)
@@ -291,7 +291,6 @@
depends-on="colorMgr,
iconManager, defViewEditor, vizMapperUtil, menuManager,
propertySheetPanel, editorWindowManager"
scope="singleton">
- <constructor-arg ref="cytoscapeDesktopServiceRef" />
<constructor-arg ref="defViewEditor" />
<constructor-arg ref="iconManager" />
<constructor-arg ref="colorMgr" />
--
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.
