Author: kono
Date: 2010-11-16 18:12:10 -0800 (Tue, 16 Nov 2010)
New Revision: 22877
Modified:
core3/swing-application-impl/trunk/pom.xml
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
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/event/CellEditorEventHandler.java
core3/vizmap-impl/trunk/pom.xml
Log:
Property sheet items were lost after switching style, but now it's fixed.
Modified: core3/swing-application-impl/trunk/pom.xml
===================================================================
--- core3/swing-application-impl/trunk/pom.xml 2010-11-17 00:30:42 UTC (rev
22876)
+++ core3/swing-application-impl/trunk/pom.xml 2010-11-17 02:12:10 UTC (rev
22877)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.cytoscape</groupId>
<artifactId>parent</artifactId>
- <version>3.0.0-alpha3</version>
+ <version>3.0.0-alpha4-SNAPSHOT</version>
</parent>
<properties>
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
2010-11-17 00:30:42 UTC (rev 22876)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
2010-11-17 02:12:10 UTC (rev 22877)
@@ -158,24 +158,15 @@
for (CyNetwork targetNetwork : networks) {
Iterator<? extends CyTableEntry> it = null;
+ ((PropertyEditorRegistry) propertySheetPanel.getTable()
+
.getEditorFactory()).registerEditor(topProperty,
+
editorManager.getDataTableComboBoxEditor((Class<? extends CyTableEntry>)
vp.getTargetDataType()));
if (vp.getTargetDataType().equals(CyNode.class)) {
it = targetNetwork.getNodeList().iterator();
- ((PropertyEditorRegistry)
propertySheetPanel.getTable()
-
.getEditorFactory()).registerEditor(topProperty,
-
editorManager.getDataTableComboBoxEditor(CyNode.class));
} else if (vp.getTargetDataType().equals(CyEdge.class))
{
it = targetNetwork.getEdgeList().iterator();
- ((PropertyEditorRegistry)
propertySheetPanel.getTable()
-
.getEditorFactory()).registerEditor(topProperty,
-
editorManager.getDataTableComboBoxEditor(CyEdge.class));
} else if
(vp.getTargetDataType().equals(CyNetwork.class)) {
it =
cyNetworkManager.getNetworkSet().iterator();
- ((PropertyEditorRegistry)
propertySheetPanel.getTable()
- .getEditorFactory())
- .registerEditor(
- topProperty,
- editorManager
-
.getDataTableComboBoxEditor(CyNetwork.class));
} else {
throw new IllegalArgumentException("Data type
not supported: " + vp.getTargetDataType());
}
@@ -188,10 +179,8 @@
* Discrete Mapping
*/
if (visualMapping instanceof DiscreteMapping && (attrName !=
null)) {
-
final SortedSet<K> attrSet = new TreeSet<K>();
-
for (CyTableEntry go : graphObjectSet) {
final Class<?> attrClass =
go.getCyRow().getDataTable()
.getColumnTypeMap().get(attrName);
@@ -207,9 +196,8 @@
topProperty, propertySheetPanel);
} else if (visualMapping instanceof ContinuousMapping
&& (attrName != null)) {
- int wi = propertySheetPanel.getTable().getCellRect(0,
1, true).width;
- VizMapperProperty<String, String,
VisualMappingFunction<K, V>> graphicalView
+ final VizMapperProperty<String, String,
VisualMappingFunction<K, V>> graphicalView
= new VizMapperProperty<String, String,
VisualMappingFunction<K, V>>(CellType.CONTINUOUS,
AbstractVizMapperPanel.GRAPHICAL_MAP_VIEW, String.class);
graphicalView.setValue(visualMapping);
graphicalView
@@ -231,7 +219,6 @@
Object value;
String stringVal;
-
for (CyTableEntry go : graphObjectSet) {
Class<?> attrClass =
go.getCyRow().getDataTable()
.getColumnTypeMap().get(attrName);
@@ -262,15 +249,11 @@
topProperty.addSubProperty(oneProperty);
}
+ } else {
+ throw new IllegalArgumentException("Unsupported mapping
type: " + visualMapping);
}
propertySheetPanel.addProperty(0, topProperty);
-// propertySheetPanel
-// .setRendererFactory(((PropertyRendererRegistry)
propertySheetPanel
-//
.getTable().getRendererFactory()));
-// propertySheetPanel
-// .setEditorFactory(((PropertyEditorRegistry)
propertySheetPanel
-//
.getTable().getEditorFactory()));
return topProperty;
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
2010-11-17 00:30:42 UTC (rev 22876)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
2010-11-17 02:12:10 UTC (rev 22877)
@@ -15,6 +15,7 @@
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyNode;
+import org.cytoscape.model.CyTableEntry;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
@@ -47,14 +48,9 @@
private static final Logger logger = LoggerFactory
.getLogger(VizMapPropertySheetBuilder.class);
- private static final VisualProperty<?>[] CATEGORY = {
- TwoDVisualLexicon.NODE, TwoDVisualLexicon.EDGE,
- TwoDVisualLexicon.NETWORK };
private PropertySheetPanel propertySheetPanel;
- private DefaultViewPanel defViewPanel;
-
private DefaultTableCellRenderer emptyBoxRenderer;
private DefaultTableCellRenderer filledBoxRenderer;
@@ -90,9 +86,6 @@
editorManager, tableMgr);
}
- public Map<VisualStyle, List<Property>> getPropertyMap() {
- return this.propertyMap;
- }
/**
* Create new properties.
@@ -276,6 +269,7 @@
logger.debug("Built new PROP: " +
calculatorTypeProp.getDisplayName());
+
PropertyEditor editor = ((PropertyEditorRegistry)
propertySheetPanel
.getTable().getEditorFactory())
.getEditor(calculatorTypeProp);
@@ -290,27 +284,7 @@
((PropertyEditorRegistry)
this.propertySheetPanel
.getTable().getEditorFactory())
.registerEditor(calculatorTypeProp, editorManager
-
.getDataTableComboBoxEditor(CyNode.class));
-
-
-// if (cat.equals(NODE)) {
-//
-// ((PropertyEditorRegistry)
this.propertySheetPanel
-//
.getTable().getEditorFactory())
-//
.registerEditor(calculatorTypeProp, editorManager
-//
.getDataTableComboBoxEditor(NODE));
-// } else if (cat.equals(EDGE)) {
-// ((PropertyEditorRegistry)
this.propertySheetPanel
-//
.getTable().getEditorFactory())
-//
.registerEditor(calculatorTypeProp, editorManager
-//
.getDataTableComboBoxEditor(EDGE));
-// } else {
-// ((PropertyEditorRegistry)
this.propertySheetPanel
-//
.getTable().getEditorFactory())
-//
.registerEditor(calculatorTypeProp, editorManager
-//
.getDataTableComboBoxEditor(NETWORK));
-//
-// }
+
.getDataTableComboBoxEditor((Class<? extends CyTableEntry>)
targetVP.getTargetDataType()));
}
props.add(calculatorTypeProp);
}
@@ -337,7 +311,6 @@
private void buildList(final VisualStyle style) {
unusedVisualPropType = new ArrayList<VisualProperty<?>>();
-
VisualMappingFunction<?, ?> mapping = null;
final VisualLexicon lex = style.getVisualLexicon();
@@ -430,6 +403,21 @@
}
}
}
+
+ public List<Property> getPropertyList(final VisualStyle style) {
+ if(propertyMap.containsKey(style) == false) {
+ final List<Property> newList = new
ArrayList<Property>();
+ propertyMap.put(style, newList);
+ return newList;
+ } else
+ return propertyMap.get(style);
+ }
+
+ public void removePropertyList(final VisualStyle style) {
+ propertyMap.remove(style);
+ }
+
+
/*
* Remove an entry in the browser.
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-17 00:30:42 UTC (rev 22876)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2010-11-17 02:12:10 UTC (rev 22877)
@@ -139,8 +139,6 @@
// Initialize all components
initPanel();
-
-
}
private void initPanel() {
@@ -180,6 +178,8 @@
private void switchVS(final VisualStyle style) {
switchVS(style, false);
}
+
+
private void switchVS(final VisualStyle style, boolean forceUpdate) {
logger.debug("######## Switching start: " + style.getTitle() );
@@ -193,10 +193,10 @@
// Close editor windows
editorWindowManager.closeAllEditorWindows();
-
- if
(vizMapPropertySheetBuilder.getPropertyMap().containsKey(style)) {
+ final List<Property> props =
vizMapPropertySheetBuilder.getPropertyList(style);
+ if (props.size() != 0) {
logger.debug("######## Style exists in buffer: " +
style.getTitle() );
- final List<Property> props =
vizMapPropertySheetBuilder.getPropertyMap().get(style);
+
final Map<String, Property> unused = new
TreeMap<String, Property>();
@@ -735,7 +735,7 @@
// Update image
getDefaultImageManager().remove(e.getVisualStyleToBeRemoved());
-
vizMapPropertySheetBuilder.getPropertyMap().remove(e.getVisualStyleToBeRemoved());
+
vizMapPropertySheetBuilder.removePropertyList(e.getVisualStyleToBeRemoved());
this.visualStyleComboBox.removeItem(toBeRemoved);
// Switch to the default style
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
2010-11-17 00:30:42 UTC (rev 22876)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
2010-11-17 02:12:10 UTC (rev 22877)
@@ -28,41 +28,30 @@
package org.cytoscape.view.vizmap.gui.internal.event;
import java.beans.PropertyChangeEvent;
-import java.lang.reflect.Constructor;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import javax.swing.JOptionPane;
-import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyNetworkManager;
-import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableEntry;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.model.Visualizable;
-import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
-import org.cytoscape.view.presentation.property.VisualPropertyUtil;
import org.cytoscape.view.vizmap.VisualMappingFunction;
import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
-import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
-import org.cytoscape.view.vizmap.gui.MappingFunctionFactoryManager;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
-import org.cytoscape.view.vizmap.gui.VizMapGUI;
import org.cytoscape.view.vizmap.gui.event.VizMapEventHandler;
-import org.cytoscape.view.vizmap.gui.internal.AbstractVizMapperPanel;
import org.cytoscape.view.vizmap.gui.internal.AttributeSet;
import org.cytoscape.view.vizmap.gui.internal.AttributeSetManager;
import org.cytoscape.view.vizmap.gui.internal.VizMapPropertySheetBuilder;
-import org.cytoscape.view.vizmap.gui.internal.VizMapperMainPanel;
import org.cytoscape.view.vizmap.gui.internal.VizMapperProperty;
import
org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor.AttributeComboBoxPropertyEditor;
import org.cytoscape.view.vizmap.gui.internal.util.VizMapperUtil;
-import org.cytoscape.view.vizmap.mappings.AbstractVisualMappingFunction;
import org.cytoscape.view.vizmap.mappings.ContinuousMapping;
import org.cytoscape.view.vizmap.mappings.DiscreteMapping;
import org.cytoscape.view.vizmap.mappings.PassthroughMapping;
@@ -578,12 +567,10 @@
category.getDisplayName(),
propertySheetPanel, factory);
logger.debug("!!!!!!! Removing Prop: " + prop);
-
vizMapPropertySheetBuilder.removeProperty(prop, currentStyle);
- if
(vizMapPropertySheetBuilder.getPropertyMap().get(currentStyle) != null)
-
vizMapPropertySheetBuilder.getPropertyMap().get(currentStyle)
- .add(newRootProp);
+ final List<Property> propList =
vizMapPropertySheetBuilder.getPropertyList(currentStyle);
+ propList.add(newRootProp);
prop = null;
@@ -648,10 +635,8 @@
vizMapPropertySheetBuilder.expandLastSelectedItem(vp.getDisplayName());
vizMapPropertySheetBuilder.removeProperty(parent, style);
- if
(vizMapPropertySheetBuilder.getPropertyMap().get(style.getTitle()) != null) {
-
vizMapPropertySheetBuilder.getPropertyMap().get(style.getTitle())
- .add(newRootProp);
- }
+ final List<Property> propList =
vizMapPropertySheetBuilder.getPropertyList(style);
+ propList.add(newRootProp);
parent = null;
}
Modified: core3/vizmap-impl/trunk/pom.xml
===================================================================
--- core3/vizmap-impl/trunk/pom.xml 2010-11-17 00:30:42 UTC (rev 22876)
+++ core3/vizmap-impl/trunk/pom.xml 2010-11-17 02:12:10 UTC (rev 22877)
@@ -6,7 +6,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.cytoscape</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>3.0.0-alpha4-SNAPSHOT</version>
</parent>
<properties>
--
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.
