Author: clopes
Date: 2012-06-19 14:42:22 -0700 (Tue, 19 Jun 2012)
New Revision: 29622
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
Log:
Fixes #1143 (Add "Show All" button to Default Visual Property Editor).
Also fixed selecting newly created visual style.
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
2012-06-19 20:53:37 UTC (rev 29621)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
2012-06-19 21:42:22 UTC (rev 29622)
@@ -28,10 +28,13 @@
package org.cytoscape.view.vizmap.gui.internal;
import java.awt.BorderLayout;
+import java.awt.Color;
import java.awt.Dimension;
+import java.awt.Font;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Image;
+import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.beans.PropertyChangeSupport;
@@ -52,6 +55,7 @@
import javax.swing.JSplitPane;
import javax.swing.JToggleButton;
import javax.swing.LayoutStyle;
+import javax.swing.border.TitledBorder;
import javax.swing.event.SwingPropertyChangeSupport;
import javax.swing.table.DefaultTableCellRenderer;
@@ -67,6 +71,7 @@
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;
+import org.cytoscape.view.vizmap.gui.util.PropertySheetUtil;
import com.l2fprod.common.propertysheet.PropertyEditorRegistry;
import com.l2fprod.common.propertysheet.PropertyRendererRegistry;
@@ -150,17 +155,24 @@
protected final VisualStyleFactory vsFactory;
- private JToggleButton showAllVPButton;
+ protected JToggleButton showAllVPButton;
private final SetViewModeAction viewModeAction;
protected static final long serialVersionUID = -6839011300709287662L;
- public AbstractVizMapperPanel(final VisualStyleFactory vsFactory,
DefaultViewEditor defViewEditor,
- IconManager iconMgr, ColorManager colorMgr,
VisualMappingManager vmm, VizMapperMenuManager menuMgr,
- EditorManager editorFactory, PropertySheetPanel
propertySheetPanel,
- VizMapPropertySheetBuilder vizMapPropertySheetBuilder,
EditorWindowManager editorWindowManager,
- CyApplicationManager applicationManager, CyEventHelper
eventHelper, final SetViewModeAction viewModeAction) {
-
+ public AbstractVizMapperPanel(final VisualStyleFactory vsFactory,
+ final
DefaultViewEditor defViewEditor,
+ final
IconManager iconMgr,
+ final
ColorManager colorMgr,
+ final
VisualMappingManager vmm,
+ final
VizMapperMenuManager menuMgr,
+ final
EditorManager editorFactory,
+ final
PropertySheetPanel propertySheetPanel,
+ final
VizMapPropertySheetBuilder vizMapPropertySheetBuilder,
+ final
EditorWindowManager editorWindowManager,
+ final
CyApplicationManager applicationManager,
+ final
CyEventHelper eventHelper,
+ final
SetViewModeAction viewModeAction) {
if (menuMgr == null)
throw new NullPointerException("Menu manager is
missing.");
@@ -197,10 +209,11 @@
private void addButtonToPropertySheetPanel() {
showAllVPButton = new JToggleButton();
showAllVPButton.setText("Show All");
- // This is a hack: get private component and add button.
- Field[] fields = PropertySheetPanel.class.getDeclaredFields();
+ showAllVPButton.setToolTipText("Show all Visual Properties");
+ showAllVPButton.setSelected(PropertySheetUtil.isAdvancedMode());
+ showAllVPButton.setUI(new BlueishButtonUI());
+
showAllVPButton.addActionListener(new ActionListener() {
-
@Override
public void actionPerformed(ActionEvent ae) {
viewModeAction.menuSelected(null);
@@ -208,9 +221,9 @@
}
});
- showAllVPButton.setUI(new BlueishButtonUI());
- showAllVPButton.setToolTipText("Show all Visual Properties");
-
+ // This is a hack: get private component and add button.
+ Field[] fields = PropertySheetPanel.class.getDeclaredFields();
+
for (Field f : fields) {
if (f.getName().equals("actionPanel")) {
f.setAccessible(true);
@@ -245,26 +258,25 @@
visualStyleComboBox.setSelectedItem(defaultVS);
}
+ @SuppressWarnings("serial")
private void initComponents() {
- mainSplitPane = new javax.swing.JSplitPane();
+ mainSplitPane = new JSplitPane();
mainSplitPane.setBorder(BorderFactory.createEmptyBorder());
- listSplitPane = new javax.swing.JSplitPane();
+ listSplitPane = new JSplitPane();
listSplitPane.setBorder(BorderFactory.createEmptyBorder());
- bottomPanel = new javax.swing.JPanel();
+ bottomPanel = new JPanel();
- defaultViewImagePanel = new javax.swing.JPanel();
+ defaultViewImagePanel = new JPanel();
propertySheetPanel.setTable(new VizMapPropertySheetTable());
- vsSelectPanel = new javax.swing.JPanel();
+ vsSelectPanel = new JPanel();
- buttonPanel = new javax.swing.JPanel();
+ buttonPanel = new JPanel();
initializeVisualStyleComboBox();
optionButton = new DropDownMenuButton(new AbstractAction() {
- private final static long serialVersionUID =
1213748836776579L;
-
public void actionPerformed(ActionEvent ae) {
DropDownMenuButton b = (DropDownMenuButton)
ae.getSource();
menuMgr.getMainMenu().show(b, 0, b.getHeight());
@@ -279,7 +291,7 @@
constraints.gridwidth = 1;
constraints.gridheight = GridBagConstraints.REMAINDER;
- addButton = new javax.swing.JButton();
+ addButton = new JButton();
addButton.setUI(new BlueishButtonUI());
@@ -296,7 +308,7 @@
listSplitPane.setDividerLocation(400);
listSplitPane.setDividerSize(5);
-
listSplitPane.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
+ listSplitPane.setOrientation(JSplitPane.VERTICAL_SPLIT);
// Default View Panel
// defaultViewImagePanel.setMinimumSize(new Dimension(200,
200));
@@ -305,10 +317,10 @@
defaultViewImagePanel.setSize(defaultViewImagePanel.getPreferredSize());
defaultViewImagePanel.setLayout(new BorderLayout());
- noMapListScrollPane = new javax.swing.JScrollPane();
-
noMapListScrollPane.setBorder(javax.swing.BorderFactory.createTitledBorder(null,
"Unused Visual Properties",
- javax.swing.border.TitledBorder.CENTER,
javax.swing.border.TitledBorder.DEFAULT_POSITION,
- new java.awt.Font("SansSerif", 1, 12)));
+ noMapListScrollPane = new JScrollPane();
+
noMapListScrollPane.setBorder(BorderFactory.createTitledBorder(null, "Unused
Visual Properties",
+ TitledBorder.CENTER,
TitledBorder.DEFAULT_POSITION,
+ new Font("SansSerif", 1, 12)));
noMapListScrollPane.setToolTipText("To Create New Mapping, Drag
& Drop List Item to Browser.");
GroupLayout bottomPanelLayout = new GroupLayout(bottomPanel);
@@ -325,29 +337,29 @@
listSplitPane.setLeftComponent(mainSplitPane);
listSplitPane.setRightComponent(bottomPanel);
-
mainSplitPane.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
-
defaultViewImagePanel.setBorder(javax.swing.BorderFactory.createTitledBorder(null,
"Defaults (Click to edit)",
-
javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION,
-
javax.swing.border.TitledBorder.DEFAULT_POSITION, new
java.awt.Font("SansSerif", 1, 12),
- java.awt.Color.darkGray));
+ mainSplitPane.setOrientation(JSplitPane.VERTICAL_SPLIT);
+
defaultViewImagePanel.setBorder(BorderFactory.createTitledBorder(null,
"Defaults (Click to edit)",
+ TitledBorder.DEFAULT_JUSTIFICATION,
+ TitledBorder.DEFAULT_POSITION, new
Font("SansSerif", 1, 12),
+ Color.darkGray));
mainSplitPane.setLeftComponent(defaultViewImagePanel);
-
propertySheetPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(null,
"Visual Mapping Browser",
-
javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION,
-
javax.swing.border.TitledBorder.DEFAULT_POSITION, new
java.awt.Font("SansSerif", 1, 12),
- java.awt.Color.darkGray));
+
propertySheetPanel.setBorder(BorderFactory.createTitledBorder(null, "Visual
Mapping Browser",
+ TitledBorder.DEFAULT_JUSTIFICATION,
+ TitledBorder.DEFAULT_POSITION, new
Font("SansSerif", 1, 12),
+ Color.darkGray));
mainSplitPane.setRightComponent(propertySheetPanel);
-
vsSelectPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(null,
"Current Visual Style",
-
javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION,
-
javax.swing.border.TitledBorder.DEFAULT_POSITION, new
java.awt.Font("SansSerif", 1, 12),
- java.awt.Color.darkGray));
+ vsSelectPanel.setBorder(BorderFactory.createTitledBorder(null,
"Current Visual Style",
+ TitledBorder.DEFAULT_JUSTIFICATION,
+ TitledBorder.DEFAULT_POSITION, new
Font("SansSerif", 1, 12),
+ Color.darkGray));
optionButton.setToolTipText("Options...");
optionButton.setIcon(iconMgr.getIcon("optionIcon"));
- optionButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
+ optionButton.setMargin(new Insets(2, 2, 2, 2));
optionButton.setComponentPopupMenu(menuMgr.getMainMenu());
GroupLayout vsSelectPanelLayout = new
GroupLayout(vsSelectPanel);
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
2012-06-19 20:53:37 UTC (rev 29621)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
2012-06-19 21:42:22 UTC (rev 29622)
@@ -118,16 +118,18 @@
IconManager iconManager = new IconManager();
VizMapperMenuManager menuManager = new
VizMapperMenuManager(dialogTaskManagerServiceRef,propertySheetPanel,vmmServiceRef,
cyApplicationManagerServiceRef);
DefaultViewPanelImpl defaultViewPanel = new
DefaultViewPanelImpl(cyNetworkFactoryServiceRef,graphViewFactoryServiceRef,presentationFactoryServiceRef,
vmmServiceRef);
+
VizMapperUtil vizMapperUtil = new VizMapperUtil(vmmServiceRef);
- DefaultViewEditorImpl defViewEditor = new
DefaultViewEditorImpl(defaultViewPanel,editorManager,cyApplicationManagerServiceRef,vmmServiceRef,vizMapperUtil,cyEventHelperServiceRef);
+ SetViewModeAction viewModeAction = new SetViewModeAction();
+
+ DefaultViewEditorImpl defViewEditor = new
DefaultViewEditorImpl(defaultViewPanel,editorManager,cyApplicationManagerServiceRef,vmmServiceRef,vizMapperUtil,cyEventHelperServiceRef,viewModeAction);
CreateNewVisualStyleTaskFactory createNewVisualStyleTaskFactory
= new
CreateNewVisualStyleTaskFactory(visualStyleFactoryServiceRef,vmmServiceRef);
DeleteVisualStyleTaskFactory removeVisualStyleTaskFactory = new
DeleteVisualStyleTaskFactory(vmmServiceRef);
ImportDefaultVizmapTaskFactory importDefaultVizmapTaskFactory =
new
ImportDefaultVizmapTaskFactory(vizmapReaderManagerServiceRef,vmmServiceRef,cyApplicationConfigurationServiceRef,
cyEventHelperServiceRef);
VizMapPropertySheetBuilder vizMapPropertySheetBuilder = new
VizMapPropertySheetBuilder(menuManager,cyNetworkManagerServiceRef,propertySheetPanel,editorManager,defaultViewPanel,cyTableManagerServiceRef,vizMapperUtil,vmmServiceRef);
EditorWindowManager editorWindowManager = new
EditorWindowManager(editorManager,propertySheetPanel);
- SetViewModeAction viewModeAction = new SetViewModeAction();
- VizMapperMainPanel vizMapperMainPanel = new
VizMapperMainPanel(visualStyleFactoryServiceRef,defViewEditor,iconManager,colorMgr,vmmServiceRef,menuManager,editorManager,propertySheetPanel,vizMapPropertySheetBuilder,editorWindowManager,cyApplicationManagerServiceRef,cyEventHelperServiceRef,importDefaultVizmapTaskFactory,dialogTaskManagerServiceRef,viewModeAction
);
+ VizMapperMainPanel vizMapperMainPanel = new
VizMapperMainPanel(visualStyleFactoryServiceRef,defViewEditor,iconManager,colorMgr,vmmServiceRef,menuManager,editorManager,propertySheetPanel,vizMapPropertySheetBuilder,editorWindowManager,cyApplicationManagerServiceRef,cyEventHelperServiceRef,importDefaultVizmapTaskFactory,dialogTaskManagerServiceRef,viewModeAction);
RenameVisualStyleTaskFactory renameVisualStyleTaskFactory = new
RenameVisualStyleTaskFactory(vmmServiceRef);
CopyVisualStyleTaskFactory copyVisualStyleTaskFactory = new
CopyVisualStyleTaskFactory(vmmServiceRef,visualStyleFactoryServiceRef);
CreateLegendTaskFactory createLegendTaskFactory = new
CreateLegendTaskFactory(cyApplicationManagerServiceRef, vmmServiceRef);
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2012-06-19 20:53:37 UTC (rev 29621)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2012-06-19 21:42:22 UTC (rev 29622)
@@ -37,6 +37,8 @@
import java.awt.event.ComponentEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
@@ -47,12 +49,17 @@
import javax.swing.DefaultListModel;
import javax.swing.GroupLayout;
import javax.swing.Icon;
+import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JList;
+import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
+import javax.swing.JToggleButton;
import javax.swing.LayoutStyle;
import javax.swing.ListCellRenderer;
import javax.swing.SwingUtilities;
+import javax.swing.WindowConstants;
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.event.CyEventHelper;
@@ -79,10 +86,13 @@
import org.cytoscape.view.vizmap.gui.util.PropertySheetUtil;
import org.jdesktop.swingx.JXList;
import org.jdesktop.swingx.JXPanel;
+import org.jdesktop.swingx.JXTitledPanel;
import org.jdesktop.swingx.border.DropShadowBorder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.l2fprod.common.swing.plaf.blue.BlueishButtonUI;
+
/**
* Dialog for editing default visual property values.<br>
* This is a modal dialog.
@@ -98,7 +108,7 @@
*
*/
public class DefaultViewEditorImpl extends JDialog implements
DefaultViewEditor, SetCurrentVisualStyleListener,
- LexiconStateChangedListener {
+ LexiconStateChangedListener, PropertyChangeListener {
private final static long serialVersionUID = 1202339876675416L;
@@ -117,6 +127,7 @@
private final VizMapperUtil util;
private final DefaultViewPanelImpl mainView;
private final CyEventHelper cyEventHelper;
+ private final SetViewModeAction viewModeAction;
private DependencyTable depTable;
@@ -125,7 +136,8 @@
final
CyApplicationManager cyApplicationManager,
final
VisualMappingManager vmm,
final
VizMapperUtil util,
- final
CyEventHelper cyEventHelper) {
+ final
CyEventHelper cyEventHelper,
+ final
SetViewModeAction viewModeAction) {
super();
if (mainView == null)
@@ -145,6 +157,9 @@
this.setModal(true);
this.mainView = mainView;
this.editorFactory = editorFactory;
+
+ this.viewModeAction = viewModeAction;
+ viewModeAction.addPropertyChangeListener(this);
updateVisualPropertyLists();
@@ -158,7 +173,6 @@
mainView.updateView();
}
});
-
}
private void updateVisualPropertyLists() {
@@ -233,16 +247,16 @@
private void initComponents() {
jXPanel1 = new JXPanel();
- jXTitledPanel1 = new org.jdesktop.swingx.JXTitledPanel();
- defaultObjectTabbedPane = new javax.swing.JTabbedPane();
- nodeScrollPane = new javax.swing.JScrollPane();
- dependencyScrollPane = new javax.swing.JScrollPane();
+ jXTitledPanel1 = new JXTitledPanel();
+ defaultObjectTabbedPane = new JTabbedPane();
+ nodeScrollPane = new JScrollPane();
+ dependencyScrollPane = new JScrollPane();
nodeList = new JXList();
edgeList = new JXList();
- edgeScrollPane = new javax.swing.JScrollPane();
- globalScrollPane = new javax.swing.JScrollPane();
- applyButton = new javax.swing.JButton();
+ edgeScrollPane = new JScrollPane();
+ globalScrollPane = new JScrollPane();
+ applyButton = new JButton();
networkList = new JXList();
@@ -250,9 +264,28 @@
listMap.put(CyEdge.class, edgeList);
listMap.put(CyNetwork.class, networkList);
- cancelButton = new javax.swing.JButton();
+ cancelButton = new JButton();
+ cancelButton.setText("Cancel");
cancelButton.setVisible(false);
+ cancelButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent arg0) {
+ dispose();
+ }
+ });
+ showAllVPButton = new JToggleButton();
+ showAllVPButton.setText("Show All");
+ showAllVPButton.setToolTipText("Show all Visual Properties");
+ showAllVPButton.setUI(new BlueishButtonUI());
+ showAllVPButton.setSelected(PropertySheetUtil.isAdvancedMode());
+ showAllVPButton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent ae) {
+ viewModeAction.menuSelected(null);
+ viewModeAction.actionPerformed(null);
+ }
+ });
+
nodeList.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent e) {
listActionPerformed(e);
@@ -271,14 +304,14 @@
}
});
-
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+ setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
jXTitledPanel1.setTitle("Default Visual Properties");
- jXTitledPanel1.setTitleFont(new java.awt.Font("SansSerif", 1,
12));
- jXTitledPanel1.setMinimumSize(new java.awt.Dimension(300, 27));
- jXTitledPanel1.setPreferredSize(new java.awt.Dimension(300,
27));
-
defaultObjectTabbedPane.setTabPlacement(javax.swing.JTabbedPane.BOTTOM);
+ jXTitledPanel1.setTitleFont(new Font("SansSerif", 1, 12));
+ jXTitledPanel1.setMinimumSize(new Dimension(300, 27));
+ jXTitledPanel1.setPreferredSize(new Dimension(300, 27));
+ defaultObjectTabbedPane.setTabPlacement(JTabbedPane.BOTTOM);
nodeScrollPane.setViewportView(nodeList);
edgeScrollPane.setViewportView(edgeList);
@@ -308,14 +341,6 @@
}
});
- cancelButton.setText("Cancel");
- cancelButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent arg0) {
- // TODO Auto-generated method stub
- dispose();
- }
- });
-
GroupLayout jXPanel1Layout = new GroupLayout(jXPanel1);
jXPanel1.setLayout(jXPanel1Layout);
jXPanel1Layout.setHorizontalGroup(jXPanel1Layout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(
@@ -331,6 +356,11 @@
.addComponent(cancelButton)
.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
.addComponent(applyButton))
+
.addGroup(
+
GroupLayout.Alignment.TRAILING,
+
jXPanel1Layout.createSequentialGroup()
+
.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
+
.addComponent(showAllVPButton))
.addComponent(mainView, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE,
Short.MAX_VALUE))
.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
@@ -363,7 +393,8 @@
.createParallelGroup(
GroupLayout.Alignment.BASELINE)
.addComponent(cancelButton)
-
.addComponent(applyButton))))
+
.addComponent(applyButton)
+
.addComponent(showAllVPButton))))
.addContainerGap()));
GroupLayout layout = new GroupLayout(getContentPane());
@@ -421,22 +452,23 @@
}
// Variables declaration - do not modify
- private javax.swing.JButton applyButton;
- private javax.swing.JButton cancelButton;
- private javax.swing.JScrollPane nodeScrollPane;
- private javax.swing.JScrollPane edgeScrollPane;
- private javax.swing.JScrollPane globalScrollPane;
+ private JButton applyButton;
+ private JButton cancelButton;
+ private JToggleButton showAllVPButton;
+ private JScrollPane nodeScrollPane;
+ private JScrollPane edgeScrollPane;
+ private JScrollPane globalScrollPane;
// New from 3.0
- private javax.swing.JScrollPane dependencyScrollPane;
+ private JScrollPane dependencyScrollPane;
- private javax.swing.JTabbedPane defaultObjectTabbedPane;
+ private JTabbedPane defaultObjectTabbedPane;
private JXList nodeList;
private JXList edgeList;
private JXList networkList;
- private org.jdesktop.swingx.JXPanel jXPanel1;
+ private JXPanel jXPanel1;
- private org.jdesktop.swingx.JXTitledPanel jXTitledPanel1;
+ private JXTitledPanel jXTitledPanel1;
// End of variables declaration
@@ -575,6 +607,33 @@
setTitle("Default Appearance for " + selectedStyle.getTitle());
}
+ /**
+ * Handles local property change event. This will be used to switch
view mode: show all VPs or basic VPs only.
+ */
+ @Override
+ public void propertyChange(PropertyChangeEvent fromSetViewMode) {
+ // Need to update property sheet.
+ if
(fromSetViewMode.getPropertyName().equals(SetViewModeAction.VIEW_MODE_CHANGED))
{
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+
showAllVPButton.setSelected(PropertySheetUtil.isAdvancedMode());
+ }
+ });
+
+ buildList();
+ }
+ }
+
+ @Override
+ public void handleEvent(LexiconStateChangedEvent e) {
+ logger.debug("Def editor got Lexicon update event.");
+ buildList();
+
+ mainView.updateView();
+ mainView.repaint();
+ }
+
private static class VisualPropertyComparator implements
Comparator<VisualProperty<?>> {
@Override
@@ -585,13 +644,4 @@
return name1.compareTo(name2);
}
}
-
- @Override
- public void handleEvent(LexiconStateChangedEvent e) {
- logger.debug("Def editor got Lexicon update event.");
- buildList();
-
- mainView.updateView();
- mainView.repaint();
- }
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2012-06-19 20:53:37 UTC (rev 29621)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2012-06-19 21:42:22 UTC (rev 29622)
@@ -81,6 +81,7 @@
import
org.cytoscape.view.vizmap.gui.internal.task.ImportDefaultVizmapTaskFactory;
import org.cytoscape.view.vizmap.gui.internal.theme.ColorManager;
import org.cytoscape.view.vizmap.gui.internal.theme.IconManager;
+import org.cytoscape.view.vizmap.gui.util.PropertySheetUtil;
import org.cytoscape.work.TaskManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -125,13 +126,21 @@
* @param menuMgr
* @param editorFactory
*/
- public VizMapperMainPanel(final VisualStyleFactory vsFactory, final
DefaultViewEditor defViewEditor,
- final IconManager iconMgr, final ColorManager colorMgr,
final VisualMappingManager vmm,
- final VizMapperMenuManager menuMgr, final EditorManager
editorFactory,
- final PropertySheetPanel propertySheetPanel, final
VizMapPropertySheetBuilder vizMapPropertySheetBuilder,
- final EditorWindowManager editorWindowManager, final
CyApplicationManager applicationManager,
- final CyEventHelper eventHelper, final
ImportDefaultVizmapTaskFactory taskFactory,
- final TaskManager<?, ?> tManager, final
SetViewModeAction viewModeAction) {
+ public VizMapperMainPanel(final VisualStyleFactory vsFactory,
+ final
DefaultViewEditor defViewEditor,
+ final IconManager
iconMgr,
+ final ColorManager
colorMgr,
+ final
VisualMappingManager vmm,
+ final
VizMapperMenuManager menuMgr,
+ final EditorManager
editorFactory,
+ final
PropertySheetPanel propertySheetPanel,
+ final
VizMapPropertySheetBuilder vizMapPropertySheetBuilder,
+ final
EditorWindowManager editorWindowManager,
+ final
CyApplicationManager applicationManager,
+ final CyEventHelper
eventHelper,
+ final
ImportDefaultVizmapTaskFactory taskFactory,
+ final TaskManager<?,
?> tManager,
+ final
SetViewModeAction viewModeAction) {
super(vsFactory, defViewEditor, iconMgr, colorMgr, vmm,
menuMgr, editorFactory, propertySheetPanel,
vizMapPropertySheetBuilder,
editorWindowManager, applicationManager, eventHelper, viewModeAction);
@@ -356,6 +365,7 @@
}
vsComboBoxModel.addElement(newStyle);
+ visualStyleComboBox.setSelectedItem(newStyle);
}
@Override
@@ -365,7 +375,6 @@
final VisualStyle curStyle = vmm.getCurrentVisualStyle();
if (viewStyle == null) {
- System.out.println("%% NULL style for " + view);
vmm.setVisualStyle(curStyle, view);
curStyle.apply(view);
view.updateView();
@@ -469,6 +478,7 @@
@Override
public void run() {
switchVS(vmm.getCurrentVisualStyle());
+
showAllVPButton.setSelected(PropertySheetUtil.isAdvancedMode());
}
});
}
@@ -488,6 +498,6 @@
final Object currentSelected =
visualStyleComboBox.getSelectedItem();
if (newStyle != null && !newStyle.equals(currentSelected))
- this.visualStyleComboBox.setSelectedItem(newStyle);
+ visualStyleComboBox.setSelectedItem(newStyle);
}
}
--
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.
