Author: kono
Date: 2012-04-30 12:52:59 -0700 (Mon, 30 Apr 2012)
New Revision: 29045

Removed:
   
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapListener.java
Modified:
   
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AttributeSetManager.java
   
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/AttributeComboBoxPropertyEditor.java
   
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/CyComboBoxPropertyEditor.java
   
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
   
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellType.java
   
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/VizMapEventHandlerManagerImpl.java
Log:
fixes #918 Bugs in Combo Box Property Editor had been fixed to fire correct 
event.

Modified: 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AttributeSetManager.java
===================================================================
--- 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AttributeSetManager.java
      2012-04-30 19:11:57 UTC (rev 29044)
+++ 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AttributeSetManager.java
      2012-04-30 19:52:59 UTC (rev 29045)
@@ -62,8 +62,6 @@
        public void handleEvent(NetworkAddedEvent e) {
                final CyNetwork network = e.getNetwork();
 
-               logger.debug("@@@@@@ Attr Set manager got new network." + 
network.getSUID());
-
                final Map<Class<? extends CyIdentifiable>, Set<CyTable>> 
object2tableMap = new HashMap<Class<? extends CyIdentifiable>, Set<CyTable>>();
                final Map<Class<? extends CyIdentifiable>, AttributeSet> 
attrSetMap = new HashMap<Class<? extends CyIdentifiable>, AttributeSet>();
 

Deleted: 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapListener.java
===================================================================
--- 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapListener.java
   2012-04-30 19:11:57 UTC (rev 29044)
+++ 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapListener.java
   2012-04-30 19:52:59 UTC (rev 29045)
@@ -1,154 +0,0 @@
-/*
- File: VizMapListener.java
-
- Copyright (c) 2006, 2010, The Cytoscape Consortium (www.cytoscape.org)
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications.  In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage.  See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-//----------------------------------------------------------------------------
-// $Revision: 12924 $
-// $Date: 2008-02-04 11:10:30 -0800 (Mon, 04 Feb 2008) $
-// $Author: mes $
-//----------------------------------------------------------------------------
-package org.cytoscape.view.vizmap.gui.internal;
-
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import org.cytoscape.application.CyApplicationManager;
-import org.cytoscape.view.vizmap.VisualMappingManager;
-
-
-public class VizMapListener implements PropertyChangeListener {
-       public static final String VIZMAP_PROPS_FILE_NAME = "vizmap.props";
-
-       private VisualMappingManager vmm;
-       private final CyApplicationManager applicationManager;
-       
-       public VizMapListener(VisualMappingManager vmm, CyApplicationManager 
applicationManager) {
-               this.applicationManager = applicationManager;
-               this.vmm = vmm;
-       }
-
-       /**
-        *  DOCUMENT ME!
-        *
-        * @param e DOCUMENT ME!
-        */
-       public void propertyChange(PropertyChangeEvent e) {
-               //FIXME  Need to be replaced by the new event framework.
-//             if (e.getPropertyName() == 
VisualMappingManager.SAVE_VIZMAP_PROPS) {
-//                     // This section is for saving VS in a vizmap.props file.
-//                     // If signal contains no new value, Cytoscape consider 
it as a
-//                     // default file. Otherwise, save it as a user file.
-//                     File propertiesFile = null;
-//
-//                     if (e.getNewValue() == null)
-//                             propertiesFile = 
CytoscapeInit.getConfigFile(VIZMAP_PROPS_FILE_NAME);
-//                     else
-//                             propertiesFile = new File((String) 
e.getNewValue());
-//
-//                     if (propertiesFile != null) {
-//                             Set test = 
CalculatorCatalogFactory.getCalculatorCatalog().getVisualStyleNames();
-//                             Iterator it = test.iterator();
-//                             System.out.println("Saving the following Visual 
Styles: ");
-//
-//                             while (it.hasNext())
-//                                     System.out.println("    - " + 
it.next().toString());
-//
-//                             
CalculatorIO.storeCatalog(CalculatorCatalogFactory.getCalculatorCatalog(),
-//                                                       propertiesFile);
-//                             System.out.println("Vizmap saved to: " + 
propertiesFile);
-//                     }
-//             } else if ((e.getPropertyName() == 
VisualMappingManager.VIZMAP_RESTORED)
-//                        || (e.getPropertyName() == 
VisualMappingManager.VIZMAP_LOADED)) {
-//                     // This section is for restoring VS from a file.
-//
-//                     // only clear the existing vizmap.props if we're 
restoring
-//                     // from a session file
-//                     if (e.getPropertyName() == 
VisualMappingManager.VIZMAP_RESTORED)
-//                             
CalculatorCatalogFactory.getCalculatorCatalog().clearProps();
-//
-//                     // get the new vizmap.props and apply it the existing 
properties
-//                     Object vizmapSource = e.getNewValue();
-//                     System.out.println("vizmapSource: '" + 
vizmapSource.toString() + "'");
-//
-//                     Properties props = new Properties();
-//
-//                     try {
-//                             InputStream is = null;
-//
-//                             if (vizmapSource.getClass() == URL.class)
-//                                     // is = ((URL) 
vizmapSource).openStream();
-//                                     // Use URLUtil to get the InputStream 
since we might be using a proxy server 
-//                                     // and because pages may be cached:
-//                                     is = URLUtil.getBasicInputStream((URL) 
vizmapSource);
-//                             else if (vizmapSource.getClass() == 
String.class) {
-//                                     // if its a RESTORED event the vizmap
-//                                     // file will be in a zip file.
-//                                     if (e.getPropertyName() == 
VisualMappingManager.VIZMAP_RESTORED) {
-//                                             is = ZipUtil.readFile((String) 
vizmapSource, ".*vizmap.props");
-//
-//                                             // if its a LOADED event the 
vizmap file
-//                                             // will be a normal file.
-//                                     } else
-//                                             is = 
FileUtil.getInputStream((String) vizmapSource);
-//                             }
-//
-//                             if (is != null) {
-//                                     props.load(is);
-//                                     is.close();
-//                             }
-//                     } catch (FileNotFoundException e1) {
-//                             e1.printStackTrace();
-//                     } catch (IOException e1) {
-//                             e1.printStackTrace();
-//                     }
-//
-//                     
CalculatorCatalogFactory.getCalculatorCatalog().appendProps(props);
-//
-//                     System.out.println("Applying visual styles from: " + 
vizmapSource.toString());
-//
-//                     // In the situation where the old visual style has been 
overwritten
-//                     // with a new visual style of the same name, then make 
sure it is
-//                     // reapplied.
-//                     vmm.setVisualStyle(vmm.getVisualStyle().getName());
-//                     
vmm.setVisualStyleForView(applicationManager.getCurrentNetworkView(), 
vmm.getVisualStyle());
-//                     
//Cytoscape.redrawGraph(applicationManager.getCurrentNetworkView());
-//             }
-       }
-
-       /**
-        *  DOCUMENT ME!
-        *
-        * @param vmm DOCUMENT ME!
-        */
-       public void setVmm(VisualMappingManager vmm) {
-               this.vmm = vmm;
-       }
-
-}

Modified: 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/AttributeComboBoxPropertyEditor.java
===================================================================
--- 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/AttributeComboBoxPropertyEditor.java
    2012-04-30 19:11:57 UTC (rev 29044)
+++ 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/AttributeComboBoxPropertyEditor.java
    2012-04-30 19:52:59 UTC (rev 29045)
@@ -26,13 +26,12 @@
  * 
  * Export this as an OSGi service!
  */
-public class AttributeComboBoxPropertyEditor extends CyComboBoxPropertyEditor 
implements ListEditor,
+public final class AttributeComboBoxPropertyEditor extends 
CyComboBoxPropertyEditor implements ListEditor,
                SetCurrentNetworkViewListener {
 
        private static final Logger logger = 
LoggerFactory.getLogger(AttributeComboBoxPropertyEditor.class);
 
        private final Class<? extends CyIdentifiable> type;
-
        private final AttributeSetManager attrManager;
 
        public AttributeComboBoxPropertyEditor(final Class<? extends 
CyIdentifiable> type,
@@ -63,10 +62,11 @@
 
                if (currentNetwork != null) {
                        final AttributeSet targetSet = 
this.attrManager.getAttributeSet(currentNetwork, type);
-                       if (targetSet == null)
-                               throw new NullPointerException("AttributeSet is 
null.");
 
                        final SortedSet<String> sortedName = new 
TreeSet<String>();
+                       if (targetSet == null)
+                               return;
+                       
                        for (String attrName : targetSet.getAttrMap().keySet())
                                sortedName.add(attrName);
 

Modified: 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/CyComboBoxPropertyEditor.java
===================================================================
--- 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/CyComboBoxPropertyEditor.java
   2012-04-30 19:11:57 UTC (rev 29044)
+++ 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/CyComboBoxPropertyEditor.java
   2012-04-30 19:52:59 UTC (rev 29045)
@@ -40,7 +40,7 @@
 
 /**
  * Combo box to select discrete values.
- *
+ * 
  */
 public class CyComboBoxPropertyEditor extends AbstractPropertyEditor {
 
@@ -48,32 +48,25 @@
        private static final Color NOT_SELECTED = new Color(51, 51, 255, 150);
        private static final Color SELECTED = Color.red;
        private static final Font SELECTED_FONT = new Font("SansSerif", 
Font.BOLD, 12);
-       
+
        private Object oldValue;
        private Icon[] icons;
 
        // For overriding parent class's PCS.
        private final PropertyChangeSupport pcs;
-       
+
        public CyComboBoxPropertyEditor() {
                pcs = new PropertyChangeSupport(this);
-               
-               editor = new JComboBox() {
-                       
-                       private final static long serialVersionUID = 
1213748837100875L;
 
-                       public void setSelectedItem(Object anObject) {
-                               oldValue = getSelectedItem();
-                               super.setSelectedItem(anObject);
-                       }
-               };
+               editor = new JComboBox();
 
                final JComboBox combo = (JComboBox) editor;
                combo.setRenderer(new Renderer());
                combo.addPopupMenuListener(new PopupMenuListener() {
-                       
+
                        @Override
-                       public void popupMenuCanceled(PopupMenuEvent e) {}
+                       public void popupMenuCanceled(PopupMenuEvent e) {
+                       }
 
                        @Override
                        public void popupMenuWillBecomeInvisible(PopupMenuEvent 
e) {
@@ -89,10 +82,12 @@
                        }
 
                        @Override
-                       public void popupMenuWillBecomeVisible(PopupMenuEvent 
e) {}
-               
+                       public void popupMenuWillBecomeVisible(PopupMenuEvent 
e) {
+                               oldValue = combo.getSelectedItem();
+                       }
+
                });
-               
+
                combo.addKeyListener(new KeyAdapter() {
                        public void keyPressed(KeyEvent e) {
                                if (e.getKeyCode() == KeyEvent.VK_ENTER)
@@ -101,16 +96,16 @@
                });
                combo.setSelectedIndex(-1);
        }
-       
+
        private void firePropertyChangeEvent(Object oldValue, Object newValue) {
                this.firePropertyChange(oldValue, newValue);
        }
-       
+
        @Override
-       public void addPropertyChangeListener(PropertyChangeListener listener) 
{                
+       public void addPropertyChangeListener(PropertyChangeListener listener) {
                // Ignore duplicate method calls.
-               for(PropertyChangeListener l: pcs.getPropertyChangeListeners()) 
{
-                       if(l == listener)
+               for (PropertyChangeListener l : 
pcs.getPropertyChangeListeners()) {
+                       if (l == listener)
                                return;
                }
                pcs.addPropertyChangeListener(listener);
@@ -154,24 +149,22 @@
                ((JComboBox) editor).setSelectedIndex(index);
        }
 
-
        public void setAvailableValues(final Object[] values) {
                ((JComboBox) editor).setModel(new DefaultComboBoxModel(values));
 
                if (((JComboBox) editor).getItemCount() != 0)
                        ((JComboBox) editor).setSelectedIndex(0);
        }
-       
+
        public Set<Object> getAvailableValues() {
                final int itemCount = ((JComboBox) editor).getModel().getSize();
                final Set<Object> items = new HashSet<Object>();
-               
-               for(int i=0; i<itemCount; i++)
+
+               for (int i = 0; i < itemCount; i++)
                        items.add(((JComboBox) 
editor).getModel().getElementAt(i));
                return items;
        }
 
-       
        public void setAvailableIcons(Icon[] icons) {
                this.icons = icons;
        }
@@ -179,11 +172,10 @@
        private final class Renderer extends DefaultListCellRenderer {
                private final static long serialVersionUID = 1213748837110925L;
 
-               public Component getListCellRendererComponent(JList list, 
Object value,
-                               int index, boolean isSelected, boolean 
cellHasFocus) {
+               public Component getListCellRendererComponent(JList list, 
Object value, int index, boolean isSelected,
+                               boolean cellHasFocus) {
                        Component component = 
super.getListCellRendererComponent(list,
-                                       (value instanceof Value) ? ((Value) 
value).visualValue
-                                                       : value, index, 
isSelected, cellHasFocus);
+                                       (value instanceof Value) ? ((Value) 
value).visualValue : value, index, isSelected, cellHasFocus);
 
                        if ((icons != null) && (index >= 0) && component 
instanceof JLabel)
                                ((JLabel) component).setIcon(icons[index]);
@@ -194,15 +186,11 @@
                        if (value == null) {
                                component = new JLabel("Select Value!");
                                component.setForeground(SELECTED);
-                               ((JLabel) component).setFont(new 
Font("SansSerif", Font.BOLD,
-                                               12));
-                       } else if ((value == null)
-                                       && (((JComboBox) editor).getItemCount() 
!= 0)) {
-                               component = new JLabel(((JComboBox) 
editor).getItemAt(0)
-                                               .toString());
+                               ((JLabel) component).setFont(new 
Font("SansSerif", Font.BOLD, 12));
+                       } else if ((value == null) && (((JComboBox) 
editor).getItemCount() != 0)) {
+                               component = new JLabel(((JComboBox) 
editor).getItemAt(0).toString());
                                component.setForeground(SELECTED);
-                               ((JLabel) component).setFont(new 
Font("SansSerif", Font.BOLD,
-                                               12));
+                               ((JLabel) component).setFont(new 
Font("SansSerif", Font.BOLD, 12));
                        }
 
                        if (isSelected) {

Modified: 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
===================================================================
--- 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
     2012-04-30 19:11:57 UTC (rev 29044)
+++ 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
     2012-04-30 19:52:59 UTC (rev 29045)
@@ -28,17 +28,15 @@
 package org.cytoscape.view.vizmap.gui.internal.event;
 
 import java.beans.PropertyChangeEvent;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.swing.JOptionPane;
 
 import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.model.CyIdentifiable;
 import org.cytoscape.model.CyNetwork;
 import org.cytoscape.model.CyNetworkTableManager;
 import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyIdentifiable;
 import org.cytoscape.view.model.VisualProperty;
 import org.cytoscape.view.model.Visualizable;
 import org.cytoscape.view.vizmap.VisualMappingFunction;
@@ -67,7 +65,7 @@
 /**
  *
  */
-public class CellEditorEventHandler implements VizMapEventHandler {
+public final class CellEditorEventHandler implements VizMapEventHandler {
 
        private static final Logger logger = 
LoggerFactory.getLogger(CellEditorEventHandler.class);
 
@@ -111,11 +109,10 @@
         * Other old global events (ex. Cytoscape.NETWORK_LOADED) is replaced 
by new
         * events.
         * 
-        * @param e
-        *            DOCUMENT ME!
+        * @param e PCE to be processed in this handler.
         */
        @Override
-       public void processEvent(PropertyChangeEvent e) {               
+       public void processEvent(final PropertyChangeEvent e) {         
 
                final Object newVal = e.getNewValue();
                final Object oldVal = e.getOldValue();
@@ -140,45 +137,18 @@
                final Item selectedItem = (Item) 
propertySheetPanel.getTable().getValueAt(selected, 0);
                final VizMapperProperty<?, ?, ?> prop = (VizMapperProperty<?, 
?, ?>) selectedItem.getProperty();
 
-               logger.debug("#### Got new PROP: Name = " + 
prop.getDisplayName());
-               logger.debug("#### Got new PROP: new Value = " + newVal);
-
                VisualProperty<?> type = null;
-
-               // Case 1: Attribute type changed.
-               if (prop.getCellType().equals(CellType.VISUAL_PROPERTY_TYPE)) {
-                       
-                       if (e.getNewValue() == null)
-                               throw new NullPointerException("New controlling 
attr name is null.");
-
-                       VisualMappingFunctionFactory factory = 
(VisualMappingFunctionFactory) prop.getInternalValue();
-
-                       if (factory == null) {
-                               logger.debug("## Factory is still null.");
-                               Property[] children = prop.getSubProperties();
-                               for (int i = 0; i < children.length; i++) {
-                                       final VizMapperProperty<?, ?, ?> child 
= (VizMapperProperty<?, ?, ?>) children[i];
-                                       if 
(child.getCellType().equals(CellType.MAPPING_TYPE)
-                                                       && child.getValue() 
instanceof VisualMappingFunctionFactory) {
-                                               factory = 
(VisualMappingFunctionFactory) child.getValue();
-                                               break;
-                                       }
-                               }
-                               if (factory == null)
-                                       return;
-                       }
-
-                       final AttributeComboBoxPropertyEditor editor = 
(AttributeComboBoxPropertyEditor) e.getSource();
-                       switchControllingAttr(factory, editor, prop, 
e.getNewValue().toString());
-               }
-
-               // 2. Switch mapping type
-               if (prop.getCellType().equals(CellType.MAPPING_TYPE)) {
-                       if (e.getNewValue() == e.getOldValue())
+               
+               if (prop.getCellType() == CellType.VISUAL_PROPERTY_TYPE) {
+                       // Case 1: Attribute type changed.
+                       if (newVal == null)
                                return;
-
+                       final AttributeComboBoxPropertyEditor editor = 
(AttributeComboBoxPropertyEditor) e.getSource();
+                       processTableColumnChange(newVal.toString(), prop, 
editor);
+               } else if (prop.getCellType() == CellType.MAPPING_TYPE) {
+                       // Case 2. Switch mapping type
                        // Parent is always root.
-                       VizMapperProperty<?, ?, ?> parent = 
(VizMapperProperty<?, ?, ?>) prop.getParentProperty();
+                       final VizMapperProperty<?, ?, ?> parent = 
(VizMapperProperty<?, ?, ?>) prop.getParentProperty();
                        type = (VisualProperty<?>) parent.getKey();
                        Object controllingAttrName = parent.getValue();
 
@@ -191,7 +161,7 @@
                        switchMappingType(prop, type, 
(VisualMappingFunctionFactory) e.getNewValue(),
                                        controllingAttrName.toString());
                } else if (prop.getParentProperty() != null) {
-                       // Discrete Cell editor event. Create new map entry and 
register it.
+                       // Case 3: Discrete Cell editor event. Create new map 
entry and register it.
                        logger.debug("Cell edit event: name = " + 
prop.getName());
                        logger.debug("Cell edit event: old val = " + 
prop.getValue());
                        logger.debug("Cell edit event: new val = " + newVal);
@@ -274,7 +244,7 @@
                propertySheetPanel.removeProperty(prop);
 
                // Create new one.
-               logger.warn("Creating new prop sheet objects for " + 
newMapping.getMappingColumnName() + ", "
+               logger.debug("Creating new prop sheet objects for " + 
newMapping.getMappingColumnName() + ", "
                                + vp.getDisplayName());
 
                final VisualProperty<Visualizable> category = 
util.getCategory((Class<? extends CyIdentifiable>) vp
@@ -362,4 +332,24 @@
 
                vizMapPropertySheetBuilder.updateTableView();
        }
+       
+       private void processTableColumnChange(final String newColumnName, final 
VizMapperProperty<?, ?, ?> prop,
+                       final AttributeComboBoxPropertyEditor editor) {
+               
+               VisualMappingFunctionFactory factory = 
(VisualMappingFunctionFactory) prop.getInternalValue();
+               if (factory == null) {
+                       Property[] children = prop.getSubProperties();
+                       for (int i = 0; i < children.length; i++) {
+                               final VizMapperProperty<?, ?, ?> child = 
(VizMapperProperty<?, ?, ?>) children[i];
+                               if 
(child.getCellType().equals(CellType.MAPPING_TYPE)
+                                               && child.getValue() instanceof 
VisualMappingFunctionFactory) {
+                                       factory = 
(VisualMappingFunctionFactory) child.getValue();
+                                       break;
+                               }
+                       }
+                       if (factory == null)
+                               return;
+               }
+               switchControllingAttr(factory, editor, prop, newColumnName);
+       }
 }

Modified: 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellType.java
===================================================================
--- 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellType.java
   2012-04-30 19:11:57 UTC (rev 29044)
+++ 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellType.java
   2012-04-30 19:52:59 UTC (rev 29045)
@@ -8,5 +8,4 @@
  */
 public enum CellType {
        MAPPING_TYPE, VISUAL_PROPERTY_TYPE, DISCRETE, CONTINUOUS, CATEGORY, 
UNUSED;
-
 }

Modified: 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/VizMapEventHandlerManagerImpl.java
===================================================================
--- 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/VizMapEventHandlerManagerImpl.java
      2012-04-30 19:11:57 UTC (rev 29044)
+++ 
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/VizMapEventHandlerManagerImpl.java
      2012-04-30 19:52:59 UTC (rev 29045)
@@ -2,7 +2,6 @@
 
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
 import java.beans.PropertyEditor;
 import java.util.HashMap;
 import java.util.Map;
@@ -45,8 +44,6 @@
 
        private final VizMapperUtil util;
        
-       private PropertyChangeSupport mappingTypePCS;
-
        public VizMapEventHandlerManagerImpl(final SelectedVisualStyleManager 
manager, final EditorManager editorManager,
                        final VizMapPropertySheetBuilder 
vizMapPropertySheetBuilder, final PropertySheetPanel propertySheetPanel,
                        final VizMapperMainPanel gui, final 
CyNetworkTableManager tableMgr,

-- 
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.

Reply via email to