Changeset 2173

Timestamp:

05/22/08 08:29:18 (6 months ago)

Author:

npatrick

Message:

Allow users to change the NetworkType? property for NetworkResource? on the property sheet.

Files:

• trunk/framework-plugin/src/com/tresys/framework/compiler/policy/NetworkResource.java (modified) (3 diffs)
• trunk/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/model/NetworkResourceShape.java (modified) (9 diffs)

trunk/framework-plugin/src/com/tresys/framework/compiler/policy/NetworkResource.java

@@ -12 +12 @@
-
-import java.util.List;
+import java.util.Map;
-
-import com.tresys.framework.compiler.AbstractToken;
+import com.tresys.framework.compiler.dictionary.Dictionary;
-import com.tresys.framework.compiler.dictionary.IDictionaryObject;
-import com.tresys.framework.compiler.dictionary.Rdef;
-import com.tresys.framework.compiler.linkage.net.NetResource;
+import com.tresys.framework.compiler.systemResources.LabeledNetworkResource;
+import com.tresys.framework.compiler.systemResources.NetworkInfo;
-import com.tresys.framework.compiler.systemResources.SystemResource;
-
@@ -28 +32 @@
-                super (n, null, policy);
-                m_netInfo = i_netRes;
+                
+                Dictionary dictionary = policy.getDictionary ();
+                Map rdefs = dictionary.GetRdefs ();
+                Rdef rdef = (Rdef)rdefs.get ("ipsec");
+                
+                this.Add (rdef, new Token(rdef.GetName (), n.getErrorHandler ()));
+                
+                NetworkInfo info = new NetworkInfo (null, null, null, null);
+                LabeledNetworkResource ip_lab = new LabeledNetworkResource (info, rdef);
+                this.AddSystemResource (rdef, ip_lab);
-        }
-
@@ -51 +65 @@
-                {
-                        if (!GetRdefs ().isEmpty ())
-return false
+this.ClearAllRdef ()
-                }
-                return super.Add (rdef, i_token);

trunk/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/model/NetworkResourceShape.java

@@ -11 +11 @@
-
-import java.util.ArrayList;
+import java.util.Arrays;
-import java.util.List;
-import java.util.HashSet;
@@ -98 +99 @@
-        private IPropertyDescriptor[] m_descriptors = null;
-        private Vector m_rdefs = null;
+        private String[] rdefsArray = null;
-
-        private Rdef m_rdef;
@@ -151 +153 @@
-                }
-                return m_rdefs;
+        }
+        
+        public String[] getRDefsArray()
+        {
+                if (rdefsArray == null)
+                {
+                        ArrayList rdefsList = new ArrayList();
+                
+                        Dictionary dictionary = getSystem ().getDictionary ();
+                        Map rdefs = dictionary.GetRdefs ();
+                        Iterator itr = rdefs.values ().iterator ();
+
+                        while (itr.hasNext ())
+                        {
+                                Rdef item = (Rdef) itr.next ();
+                                if (item.isNetworkRdef ())
+                                        rdefsList.add (item.GetName ());
+                        }
+
+                        rdefsArray = new String[rdefsList.size ()];
+                
+                        for (int i = 0; i < rdefsList.size (); i++)
+                                rdefsArray[i] = (String)rdefsList.get (i);
+                }
+                
+                return rdefsArray;
+        }
+        
+        public Integer getRDefsArrayIndex(Rdef rdef)
+        {
+                return new Integer(Arrays.binarySearch (getRDefsArray (), rdef.GetName ()));
-        }
-        
@@ -257 +290 @@
-
-                        {
-PropertyDescriptor prop_desc = new PropertyDescriptor (NETWORK_TYPE_PROP, DISPLAY_NAME_NETWORK_TYPE
-NETWORK_RESOURC
+ComboBoxPropertyDescriptor prop_desc = new ComboBoxPropertyDescriptor (NETWORK_TYPE_PROP, DISPLAY_NAME_NETWORK_TYPE, getRDefsArray ()
+SECTION_BAS
-                                myDescriptors.add (prop_desc);
-                        }
@@ -340 +373 @@
-                                        PropertyDescriptor desc = new ComboBoxPropertyDescriptor (NETWORK_PROTOCOL_INDEX, DISPLAY_NAME_NETWORK_PROTOCOL,
-                                                (String[]) GetNetworkProtcols ().toArray (new String[2]));
-NETWORK_RESOURC
+SECTION_BAS
-                                        myDescriptors.add (desc);
-                                }
@@ -373 +406 @@
-
-                if (NETWORK_TYPE_PROP.equals (propertyId))
-this.m_rdef
+getRDefsArrayIndex (this.m_rdef)
-
-                NetworkResource resource = (NetworkResource) getComponent ();
@@ -398 +431 @@
-
-                if (NETWORK_LOCAL_DEVICE.equals (propertyId))
-
-
+
+
+
+
+
+
+
+
-                if (NETWORK_LOCAL_IP_ADDRESS.equals (propertyId))
-
-
+
+
+
+
+
+
+
+
-                if (NETWORK_LOCAL_MASK.equals (propertyId))
-
+
+
+
+
+
+
+
-
-                if (NETWORK_LOCAL_IP_PORTS.equals (propertyId))
@@ -425 +476 @@
-                
-                if (NETWORK_REMOTE_DEVICE.equals (propertyId))
-
+
+
+
+
+
+
+
-
-                if (NETWORK_REMOTE_IP_ADDRESS.equals (propertyId))
-
+
+
+
+
+
+
+
-
-                if (NETWORK_REMOTE_MASK.equals (propertyId))
-
+
+
+
+
+
+
+
-
-                if (NETWORK_REMOTE_IP_PORTS.equals (propertyId))
@@ -455 +524 @@
-                if (NETWORK_TYPE_PROP.equals (propertyId))
-                {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-