Changeset 2233

Timestamp:

06/12/08 14:09:42 (4 months ago)

Author:

dsugar

Message:

cleanup

Files:

• trunk/framework-plugin/src/com/tresys/framework/compiler/linkage/net/NetResource.java (modified) (1 diff)
• trunk/framework-plugin/src/com/tresys/framework/plugin/builder/FrameworkBuilder.java (modified) (1 diff)
• trunk/framework-plugin/src/com/tresys/framework/plugin/editor/policy/PolicyDocumentProvider.java (modified) (1 diff)
• trunk/framework-plugin/src/com/tresys/framework/plugin/wizards/shape/NetworkResourceShapePropertyPage.java (modified) (6 diffs, 1 prop)
• trunk/framework-plugin/src/com/tresys/framework/plugin/wizards/shape/NetworkResourceShapePropertyWizard.java (modified) (1 diff, 1 prop)

trunk/framework-plugin/src/com/tresys/framework/compiler/linkage/net/NetResource.java

@@ -149 +149 @@
-                if (AUTH_KEY_TYPE_MD5.equals (i_sAuthType))
-                {
-20
+15
-                }
-                else

trunk/framework-plugin/src/com/tresys/framework/plugin/builder/FrameworkBuilder.java

@@ -128 +128 @@
-                                                String sName = currResource.getName ();
-                                                sName = sName.substring (0, sName.length () - sExtn.length () -1);
-
+ != null && sys
-                                                        m_buildSystems.add (sys);
-                                        }

trunk/framework-plugin/src/com/tresys/framework/plugin/editor/policy/PolicyDocumentProvider.java

@@ -82 +82 @@
-        public SELinuxSystem getSystem ()
-        {
+                if (m_currentFile == null)
+                return null;
+                
-                FrameworkNature nat = FrameworkNature.getNature(m_currentFile.getProject());
-                if (nat == null)

trunk/framework-plugin/src/com/tresys/framework/plugin/wizards/shape/NetworkResourceShapePropertyPage.java

@@ -5 +5 @@
-|*|  
-|*| $Rev$
-: 2008-05-21 15:17:37 -0400 (Wed, 21 May 2008) 
+
-\*/
-
@@ -243 +243 @@
-                        modifyValue (s);
-                        
-equals ("")
+length () == 0
-                                        updateStatus (this.errorMessage, false);
-                        
@@ -269 +269 @@
-                        modifyValue (s);
-                        
-equals ("")
+length () == 0
-                        {
-                                updateStatus();                 
@@ -306 +306 @@
-                        modifyValue (s);
-                        
-equals ("")
+length () == 0
-                        {
-                                updateStatus();                 
@@ -594 +594 @@
-                        if ((getNetworkType().GetSysResourceState (SystemResourceTypes.ipsec) == SysResourceState.Yes || getNetworkType().GetSysResourceState (SystemResourceTypes.ipsec) == SysResourceState.Optional))
-                        {
-this.localIPAddress.equals ("")
+localIPAddress.length () == 0
-                                        super.updateStatus (Messages.NetworkResourcePropertyPage_bad_local_ip_address, false);
-                        }
@@ -600 +600 @@
-                        else if ((getNetworkType().GetSysResourceState (SystemResourceTypes.secmark) == SysResourceState.Yes || getNetworkType().GetSysResourceState (SystemResourceTypes.secmark) == SysResourceState.Optional))
-                        {
-this.localDevice.equals("") && this.localIPAddress.equals ("")
+localDevice.length () == 0 && localIPAddress.length () == 0
-                                        super.updateStatus (Messages.NetworkResourcePropertyPage_err_local_device_or_ip, false);
-                        }               

trunk/framework-plugin/src/com/tresys/framework/plugin/wizards/shape/NetworkResourceShapePropertyWizard.java

@@ -5 +5 @@
-|*|  
-|*| $Rev$
-: 2008-05-21 15:17:37 -0400 (Wed, 21 May 2008) 
+
-\*/
-