[teiid-commits] teiid SVN: r962 - in trunk/console/src/main/java/com/metamatrix: console/ui/views/properties and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2009-05-17 17:44:36 -0400 (Sun, 17 May 2009)
New Revision: 962

Modified:
   trunk/console/src/main/java/com/metamatrix/console/ui/util/ExpertPropertiedObjectPanelHolder.java
   trunk/console/src/main/java/com/metamatrix/console/ui/views/properties/ConsolePropertyObjectId.java
   trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/property/PropertiedObjectPanel.java
Log:
TEIID-606 changed all of the console property views to only have a concept of hiding expert properties.

Modified: trunk/console/src/main/java/com/metamatrix/console/ui/util/ExpertPropertiedObjectPanelHolder.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/util/ExpertPropertiedObjectPanelHolder.java	2009-05-17 20:28:24 UTC (rev 961)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/util/ExpertPropertiedObjectPanelHolder.java	2009-05-17 21:44:36 UTC (rev 962)
@@ -59,7 +59,7 @@
                 GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
 
         if (expertCheckBoxChangeListener != null) {
-            expertPropertiesCheckBox = new CheckBox("Include expert properties"); //$NON-NLS-1$
+            expertPropertiesCheckBox = new CheckBox("Include expert properties", thePanel.getShowExpertProperties()?CheckBox.SELECTED:CheckBox.DESELECTED); //$NON-NLS-1$
             expertPropertiesCheckBox.addItemListener(expertCheckBoxChangeListener);
             buttonPanel.add(expertPropertiesCheckBox);
         } else {

Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/properties/ConsolePropertyObjectId.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/properties/ConsolePropertyObjectId.java	2009-05-17 20:28:24 UTC (rev 961)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/properties/ConsolePropertyObjectId.java	2009-05-17 21:44:36 UTC (rev 962)
@@ -122,7 +122,7 @@
         Iterator iter = pd.iterator();
         while ( iter.hasNext()){
             PropertyDefinition propDefn = (PropertyDefinition)iter.next();
-            boolean expert = propDefn.isExpert() && !propDefn.isRequired();
+            boolean expert = propDefn.isExpert() && (!propDefn.isRequired() || propDefn.hasDefaultValue());
             if(((expert && isExpertProperties()) || (!expert && !isExpertProperties()) || isBothBEProperties()) && !propDefnsBE.contains(propDefn)){
                 propDefnsBE.add(propDefn);
             }

Modified: trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/property/PropertiedObjectPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/property/PropertiedObjectPanel.java	2009-05-17 20:28:24 UTC (rev 961)
+++ trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/property/PropertiedObjectPanel.java	2009-05-17 21:44:36 UTC (rev 962)
@@ -654,7 +654,7 @@
             if ( ! showHidden && (def.isHidden() || !def.isModifiable())) {
                 continue;
             }
-            if ( ! showExpert && def.isExpert() && !def.isRequired() ) {
+            if ( ! showExpert && def.isExpert() && (!def.isRequired() || def.hasDefaultValue())) {
             	continue;
             }
             if ( propertiesToFilterOut.contains(def) ) {