Changeset 2176

Show
Ignore:
Timestamp:
05/22/08 13:57:05 (6 months ago)
Author:
apatel
Message:

IPSEC shape was not displaying IP address in the property sheet. As shape wizard was initializing a dummy sysresource was added that needed to be removed upon finish.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2173 r2176  
    4444import com.tresys.framework.plugin.builder.SELinuxSystem; 
    4545import com.tresys.framework.plugin.editor.policy.graphic.IShapeVisitor; 
     46import com.tresys.framework.plugin.editor.policy.graphic.model.Shape.NameValidator; 
    4647import com.tresys.framework.plugin.wizards.shape.NetworkResourceShapePropertyWizard; 
    4748 
    …… 
    409410 
    410411                NetworkResource resource = (NetworkResource) getComponent (); 
    411                 List systemResources = resource.GetSystemResources(m_rdef); 
    412                 SystemResource sysResource = (SystemResource) systemResources.get (0); 
     412                SystemResource sysResource = resource.getSystemResource (m_rdef); 
    413413 
    414414                if (NETWORK_PROTOCOL_INDEX.equals (propertyId)) 
    …… 
    606606                        else if (NETWORK_REMOTE_IP_PORTS.equals (propertyId)) 
    607607                                remoteInfo.setPorts (ParsePortsString((String) value)); 
     608                        else if (NAME_PROP.equals(propertyId))  
     609                        { 
     610                                String errorMess = new NameValidator().isValid(value); 
     611                                if (errorMess == null) 
     612                                { 
     613                                        setName((String)value); 
     614                                         
     615                                } 
     616                        } 
    608617                        else 
    609618                                super.setPropertyValue (propertyId, value); 

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

    r2172 r2176  
    8686                        NetworkInfo info = new NetworkInfo (null, m_page1.localIPAddress, null, ports); 
    8787                        LabeledNetworkResource ip_lab = new LabeledNetworkResource (info, rdef); 
     88                        component.ClearSystemResources (rdef); 
    8889                        component.AddSystemResource (rdef, ip_lab); 
    8990