Changeset 2117

Timestamp:

05/13/08 15:58:20 (6 months ago)

Author:

npatrick

Message:

Fixed a problem with the NetworkResource? property sheet.
Properties in comboboxes were not being displayed properly.

Files:

• branches/networking/src/com/tresys/framework/plugin/editor/policy/graphic/model/NetworkResourceShape.java (modified) (10 diffs)
• branches/networking/src/com/tresys/framework/plugin/wizards/shape/NetworkResourceShapePropertyWizard.java (modified) (1 diff)

branches/networking/src/com/tresys/framework/plugin/editor/policy/graphic/model/NetworkResourceShape.java

@@ -10 +10 @@
-package com.tresys.framework.plugin.editor.policy.graphic.model;
-
+import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
@@ -73 +74 @@
-
-        public static final String NETWORK_LOCAL_ENCRYPTION_TYPE = "NetworkResource.LocalEncryptionType";
+        public static final String NETWORK_LOCAL_ENCRYPTION_TYPE_INDEX = "NetworkResource.LocalEncryptionTypeIndex";
-        public static final String DISPLAY_NAME_NETWORK_LOCAL_ENCRYPTION_TYPE = Messages.network_local_encryption_type;
-
@@ -88 +90 @@
-
-        public static final String NETWORK_PROTOCOL = "NetworkResource.Protocol";
+        public static final String NETWORK_PROTOCOL_INDEX = "NetworkResource.ProtocolIndex";
-        public static final String DISPLAY_NAME_NETWORK_PROTOCOL = Messages.network_protocol;
-
@@ -263 +266 @@
-                                myDescriptors[5].setCategory (PROP_NETWORK_RESOURCE);
-                                
-
+_INDEX
-                                myDescriptors[6].setCategory (PROP_NETWORK_RESOURCE);
-                        }
@@ -293 +296 @@
-                                myDescriptors[10].setCategory (PROP_NETWORK_RESOURCE);
-
-, DISPLAY_NAME_NETWORK_PROTOCOL, (String[])GetNetworkProtcols ().toArray (new String[2
+_INDEX, DISPLAY_NAME_NETWORK_PROTOCOL, (String[])GetNetworkProtcols ().toArray (new String[3
-                                myDescriptors[11].setCategory (PROP_NETWORK_RESOURCE);
-                        }
@@ -387 +390 @@
-                        return this.local_encryption_type;
-                
+                if (NETWORK_LOCAL_ENCRYPTION_TYPE_INDEX.equals(propertyId))
+                        return this.GetNetworkEncryptionIndex ();
+                
-                if (NETWORK_REMOTE_DEVICE.equals (propertyId))
-                        return this.remote_device;
@@ -401 +407 @@
-                if (NETWORK_PROTOCOL.equals (propertyId))
-                        return this.protocol;
+                
+                if (NETWORK_PROTOCOL_INDEX.equals(propertyId))
+                        return this.GetNetworkProtocolIndex ();
-                
-                return super.getPropertyValue (propertyId);
@@ -439 +448 @@
-                else if (NETWORK_LOCAL_ENCRYPTION_TYPE.equals (propertyId))
-                        this.local_encryption_type = (String)value;
+                else if (NETWORK_LOCAL_ENCRYPTION_TYPE_INDEX.equals (propertyId))
+                        this.SetNetworkEncryptionIndex (value);
-                else if (NETWORK_REMOTE_DEVICE.equals (propertyId))
-                        this.remote_device = (String)value;
@@ -449 +460 @@
-                else if (NETWORK_PROTOCOL.equals (propertyId))
-                        this.protocol = (String)value;
+                else if (NETWORK_PROTOCOL_INDEX.equals (propertyId))
+                        this.SetNetworkProtocolIndex (value);
-                else
-                        super.setPropertyValue (propertyId, value);
-        }
-
+        public Integer GetNetworkEncryptionIndex()
+        {
+                ArrayList list = new ArrayList(GetNetworkEncryptionTypes ());
+                return new Integer(list.indexOf (this.local_encryption_type));  
+        }
+        
+        public void SetNetworkEncryptionIndex(Object index)
+        {
+                ArrayList list = new ArrayList(GetNetworkEncryptionTypes ());
+                this.local_encryption_type = (String) list.get ((Integer)index);
+        }
+        
+        public Integer GetNetworkProtocolIndex()
+        {
+                ArrayList list = new ArrayList(GetNetworkProtcols());
+                return new Integer(list.indexOf (this.protocol));
+        }
+        
+        public void SetNetworkProtocolIndex(Object index)
+        {
+                ArrayList list = new ArrayList(GetNetworkProtcols());
+                this.protocol = (String) list.get ((Integer)index);
+        }
+        
-        public static Set GetNetworkEncryptionTypes ()
-        {
@@ -465 +502 @@
-        {
-                HashSet protocols = new HashSet ();
+                protocols.add ("All");
-                protocols.add ("tcp");
-                protocols.add ("udp");

branches/networking/src/com/tresys/framework/plugin/wizards/shape/NetworkResourceShapePropertyWizard.java

@@ -62 +62 @@
-                this.m_shape.setPropertyValue (NetworkResourceShape.NETWORK_REMOTE_IP_ADDRESS, m_page1.remoteIPAddress);
-                this.m_shape.setPropertyValue (NetworkResourceShape.NETWORK_REMOTE_MASK, m_page1.remoteMask);
+                this.m_shape.setPropertyValue (NetworkResourceShape.NETWORK_REMOTE_IP_PORTS, m_page1.remoteIPPorts);
-                this.m_shape.setPropertyValue (NetworkResourceShape.NETWORK_PROTOCOL, m_page1.protocol);
-