Author: kono
Date: 2009-08-07 17:33:25 -0700 (Fri, 07 Aug 2009)
New Revision: 17744
Added:
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/StringValueEditor.java
Modified:
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/editor/EditorManager.java
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapListener.java
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetMouseAdapter.java
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/AttributeComboBoxPropertyEditor.java
core3/vizmap-gui/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
core3/vizmap-gui/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
Log:
String value editor added.
Modified:
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/editor/EditorManager.java
===================================================================
---
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/editor/EditorManager.java
2009-08-07 22:57:26 UTC (rev 17743)
+++
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/editor/EditorManager.java
2009-08-08 00:33:25 UTC (rev 17744)
@@ -43,6 +43,7 @@
import javax.swing.table.TableCellRenderer;
+import org.cytoscape.model.CyDataTable;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
@@ -175,5 +176,14 @@
*/
public PropertyEditor getDefaultComboBoxEditor(String editorName);
+ /**
+ * DOCUMENT ME!
+ *
+ * @param editorName DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ public PropertyEditor getDataTableComboBoxEditor(CyDataTable table,
String editorName);
+
public <V> ValueEditor<V> getValueEditor(Class<V> dataType);
}
Modified:
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapListener.java
===================================================================
---
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapListener.java
2009-08-07 22:57:26 UTC (rev 17743)
+++
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapListener.java
2009-08-08 00:33:25 UTC (rev 17744)
@@ -56,10 +56,9 @@
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.session.CyNetworkManager;
-import cytoscape.util.FileUtil;
-import cytoscape.util.ZipUtil;
+
/**
*
*/
Modified:
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
===================================================================
---
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
2009-08-07 22:57:26 UTC (rev 17743)
+++
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
2009-08-08 00:33:25 UTC (rev 17744)
@@ -288,7 +288,6 @@
prop.setDisplayName(type.getDisplayName());
prop.setHiddenObject(type);
prop.setValue("Double-Click to create...");
- // prop.setEditable(false);
propertySheetPanel.addProperty(prop);
propList.add(prop);
}
Modified:
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetMouseAdapter.java
===================================================================
---
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetMouseAdapter.java
2009-08-07 22:57:26 UTC (rev 17743)
+++
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetMouseAdapter.java
2009-08-08 00:33:25 UTC (rev 17744)
@@ -51,6 +51,7 @@
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
import org.cytoscape.view.vizmap.gui.event.SelectedVisualStyleSwitchedEvent;
import
org.cytoscape.view.vizmap.gui.event.SelectedVisualStyleSwitchedEventListener;
+import
org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor.CyComboBoxPropertyEditor;
import com.l2fprod.common.propertysheet.Property;
import com.l2fprod.common.propertysheet.PropertyEditorRegistry;
@@ -67,6 +68,13 @@
private EditorManager editorManager;
private VisualStyle selectedStyle;
+
+ private final CyComboBoxPropertyEditor mappingTypeEditor;
+ private final PropertyEditor nodeAttributeEditor;
+ private final PropertyEditor edgeAttributeEditor;
+
+
+ private static final String[] MAPPING_TYPE = {"Pass Through",
"Discrete", "Continuous"};
/**
* Creates a new VizMapPropertySheetMouseAdapter object.
@@ -86,6 +94,13 @@
this.propertySheetPanel = propertySheetPanel;
this.selectedStyle = selectedStyle;
this.editorManager = editorManager;
+
+ this.mappingTypeEditor = (CyComboBoxPropertyEditor)
this.editorManager.getDefaultComboBoxEditor("mappingTypeEditor");
+ this.mappingTypeEditor.setAvailableValues(MAPPING_TYPE);
+
+ this.nodeAttributeEditor =
editorManager.getDataTableComboBoxEditor(null, "nodeAttrEditor");
+ this.edgeAttributeEditor =
editorManager.getDataTableComboBoxEditor(null, "edgeAttrEditor");
+
}
/**
@@ -133,24 +148,20 @@
newProp.setHiddenObject(vp);
newProp.setValue("Please select a value!");
-
- PropertyEditor editor = null;
if (vp.getObjectType().equals(NODE)) {
newProp.setCategory(vp.getObjectType());
- editor =
editorManager.getDefaultComboBoxEditor("nodeAttrEditor");
- ((PropertyEditorRegistry)
propertySheetPanel.getTable().getEditorFactory()).registerEditor(newProp,
editor);
+
+ ((PropertyEditorRegistry)
propertySheetPanel.getTable().getEditorFactory()).registerEditor(newProp,
nodeAttributeEditor);
} else {
newProp.setCategory(EDGE);
- editor = editorManager
-
.getDefaultComboBoxEditor("edgeAttrEditor");
- ((PropertyEditorRegistry)
propertySheetPanel.getTable().getEditorFactory()).registerEditor(newProp,
editor);
+ ((PropertyEditorRegistry)
propertySheetPanel.getTable().getEditorFactory()).registerEditor(newProp,
edgeAttributeEditor);
}
mapProp.setDisplayName("Mapping Type");
mapProp.setValue("Please select a mapping
type!");
- ((PropertyEditorRegistry)
propertySheetPanel.getTable().getEditorFactory()).registerEditor(mapProp,
editorManager
-
.getDefaultComboBoxEditor("mappingTypeEditor"));
+ ((PropertyEditorRegistry)
propertySheetPanel.getTable().getEditorFactory()).registerEditor(mapProp,
mappingTypeEditor);
+
System.out.println("====================>
Registered: " + ((PropertyEditorRegistry)
propertySheetPanel.getTable().getEditorFactory()).getEditor(newProp));
newProp.addSubProperty(mapProp);
Modified:
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
===================================================================
---
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
2009-08-07 22:57:26 UTC (rev 17743)
+++
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
2009-08-08 00:33:25 UTC (rev 17744)
@@ -40,11 +40,13 @@
import java.util.Map;
import java.util.Set;
+import org.cytoscape.model.CyDataTable;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
import org.cytoscape.view.vizmap.gui.editor.ValueEditor;
import org.cytoscape.view.vizmap.gui.editor.VisualPropertyEditor;
+import
org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor.AttributeComboBoxPropertyEditor;
import
org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor.CyComboBoxPropertyEditor;
/**
@@ -241,8 +243,17 @@
}
public <V> ValueEditor<V> getValueEditor(Class<V> dataType) {
- // TODO Auto-generated method stub
return (ValueEditor<V>) this.valueEditors.get(dataType);
}
+ public PropertyEditor getDataTableComboBoxEditor(CyDataTable table,
+ String editorName) {
+ PropertyEditor editor = comboBoxEditors.get(editorName);
+ if (editor == null) {
+ editor = new AttributeComboBoxPropertyEditor(table);
+ comboBoxEditors.put(editorName, editor);
+ }
+ return editor;
+ }
+
}
Modified:
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/AttributeComboBoxPropertyEditor.java
===================================================================
---
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/AttributeComboBoxPropertyEditor.java
2009-08-07 22:57:26 UTC (rev 17743)
+++
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/AttributeComboBoxPropertyEditor.java
2009-08-08 00:33:25 UTC (rev 17744)
@@ -38,8 +38,12 @@
}
public void handleEvent(ColumnCreatedEvent e) {
+
+ System.out.println("\n\n\n\n%%%%%%%%%%%%%%%%%%% Got new Attr: "
+ e.getColumnName() + " %%%%%%%%%%, source = " + e.getSource().getTitle() +
"%%%%%%%%%\n\n\n\n");
+
final String newAttributeName = e.getColumnName();
-
+ JComboBox box = (JComboBox) editor;
+ box.addItem(newAttributeName);
}
private void initialize() {
Added:
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/StringValueEditor.java
===================================================================
---
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/StringValueEditor.java
(rev 0)
+++
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/StringValueEditor.java
2009-08-08 00:33:25 UTC (rev 17744)
@@ -0,0 +1,20 @@
+package org.cytoscape.view.vizmap.gui.internal.editor.valueeditor;
+
+import java.awt.Component;
+
+import javax.swing.JOptionPane;
+
+public class StringValueEditor extends AbstractValueEditor<String> {
+
+ private static final String MESSAGE = "Please enter new text value";
+
+ public StringValueEditor(Class<? extends String> type) {
+ super(type);
+ }
+
+ @Override
+ public String showEditor(Component parent, String initialValue) {
+ return JOptionPane.showInputDialog(parent, MESSAGE,
initialValue);
+ }
+
+}
Modified:
core3/vizmap-gui/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
===================================================================
---
core3/vizmap-gui/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
2009-08-07 22:57:26 UTC (rev 17743)
+++
core3/vizmap-gui/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
2009-08-08 00:33:25 UTC (rev 17744)
@@ -18,6 +18,7 @@
<osgi:service id="doubleValueEditorService" ref="doubleValueEditor"
auto-export="interfaces"/>
<osgi:service id="integerValueEditorService" ref="integerValueEditor"
auto-export="interfaces"/>
<osgi:service id="floatValueEditorService" ref="floatValueEditor"
auto-export="interfaces"/>
+ <osgi:service id="stringValueEditorService" ref="stringValueEditor"
auto-export="interfaces"/>
Modified:
core3/vizmap-gui/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
===================================================================
---
core3/vizmap-gui/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
2009-08-07 22:57:26 UTC (rev 17743)
+++
core3/vizmap-gui/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
2009-08-08 00:33:25 UTC (rev 17744)
@@ -86,6 +86,9 @@
<bean id="floatClass" class="java.lang.Class" factory-method="forName">
<constructor-arg value="java.lang.Float" />
</bean>
+ <bean id="stringClass" class="java.lang.Class" factory-method="forName">
+ <constructor-arg value="java.lang.String" />
+ </bean>
<bean id="doubleValueEditor"
class="org.cytoscape.view.vizmap.gui.internal.editor.valueeditor.NumericValueEditor">
@@ -99,6 +102,11 @@
class="org.cytoscape.view.vizmap.gui.internal.editor.valueeditor.NumericValueEditor">
<constructor-arg ref="floatClass" />
</bean>
+
+ <bean id="stringValueEditor"
+
class="org.cytoscape.view.vizmap.gui.internal.editor.valueeditor.StringValueEditor">
+ <constructor-arg ref="stringClass" />
+ </bean>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
