[teiid-commits] teiid SVN: r961 - in trunk/console/src/main/java/com/metamatrix: console/ui/views/authorization and 5 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Sun May 17 16:28:25 EDT 2009
Author: shawkins
Date: 2009-05-17 16:28:24 -0400 (Sun, 17 May 2009)
New Revision: 961
Removed:
trunk/console/src/main/java/com/metamatrix/console/ui/util/AbstractPropertiedObjectPanelHolder.java
trunk/console/src/main/java/com/metamatrix/console/ui/util/PropertiedObjectPanelHolder.java
Modified:
trunk/console/src/main/java/com/metamatrix/console/ui/util/ExpertPropertiedObjectPanelHolder.java
trunk/console/src/main/java/com/metamatrix/console/ui/util/POPWithButtons.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/authorization/AuthenticationProviderPropertiesPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/authorization/NewAuthenticationProviderSpecificationPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbinding/BindingPropertiesPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbinding/NewBindingWizardSpecificationPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/ServiceDefinitionPropertiesPanel.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/properties/ConsolePropertyObjectId.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/resources/ResourcesMainPanel.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.
Deleted: trunk/console/src/main/java/com/metamatrix/console/ui/util/AbstractPropertiedObjectPanelHolder.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/util/AbstractPropertiedObjectPanelHolder.java 2009-05-17 11:59:58 UTC (rev 960)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/util/AbstractPropertiedObjectPanelHolder.java 2009-05-17 20:28:24 UTC (rev 961)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership. Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-package com.metamatrix.console.ui.util;
-
-import javax.swing.JPanel;
-
-import com.metamatrix.toolbox.ui.widget.CheckBox;
-import com.metamatrix.toolbox.ui.widget.property.PropertiedObjectPanel;
-
-public abstract class AbstractPropertiedObjectPanelHolder extends JPanel {
- protected PropertiedObjectPanel thePanel;
- protected CheckBox optionalPropertiesCheckBox = null;
-
- public AbstractPropertiedObjectPanelHolder(PropertiedObjectPanel pnl) {
- super();
- thePanel = pnl;
- }
-
-
- public PropertiedObjectPanel getThePanel() {
- return thePanel;
- }
-
- public boolean isIncludingOptionalProperties() {
- return optionalPropertiesCheckBox.isSelected();
- }
-
- public void setIsIncludingOptionalProperties( boolean b ) {
- optionalPropertiesCheckBox.setSelected( b );
- }
-}
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 11:59:58 UTC (rev 960)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/util/ExpertPropertiedObjectPanelHolder.java 2009-05-17 20:28:24 UTC (rev 961)
@@ -33,16 +33,17 @@
import com.metamatrix.toolbox.ui.widget.CheckBox;
import com.metamatrix.toolbox.ui.widget.property.PropertiedObjectPanel;
-public class ExpertPropertiedObjectPanelHolder extends AbstractPropertiedObjectPanelHolder {
+public class ExpertPropertiedObjectPanelHolder extends JPanel {
protected CheckBox expertPropertiesCheckBox = null;
+ protected PropertiedObjectPanel thePanel;
public ExpertPropertiedObjectPanelHolder(PropertiedObjectPanel pnl,
- ItemListener expertCheckBoxChangeListener, ItemListener optionalCheckBoxChangeListener) {
- super(pnl);
- init(expertCheckBoxChangeListener, optionalCheckBoxChangeListener);
+ ItemListener expertCheckBoxChangeListener) {
+ this.thePanel = pnl;
+ init(expertCheckBoxChangeListener);
}
- protected void init(ItemListener expertCheckBoxChangeListener, ItemListener optionalCheckBoxChangeListener) {
+ protected void init(ItemListener expertCheckBoxChangeListener) {
setBorder(BorderFactory.createEtchedBorder());
GridBagLayout layout = new GridBagLayout();
setLayout(layout);
@@ -61,13 +62,12 @@
expertPropertiesCheckBox = new CheckBox("Include expert properties"); //$NON-NLS-1$
expertPropertiesCheckBox.addItemListener(expertCheckBoxChangeListener);
buttonPanel.add(expertPropertiesCheckBox);
+ } else {
+ layout.setConstraints(buttonPanel, new GridBagConstraints(0, 0, 1, 1,
+ 0.0, 0.0, GridBagConstraints.CENTER,
+ GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
}
- if (optionalCheckBoxChangeListener != null) {
- optionalPropertiesCheckBox = new CheckBox("Include optional properties", CheckBox.SELECTED); //$NON-NLS-1$
- optionalPropertiesCheckBox.addItemListener(optionalCheckBoxChangeListener);
- buttonPanel.add(optionalPropertiesCheckBox);
- }
}
public boolean isIncludingExpertProperties() {
@@ -77,4 +77,8 @@
public void setIsIncludingExpertProperties( boolean b ) {
expertPropertiesCheckBox.setSelected( b );
}
+
+ public PropertiedObjectPanel getThePanel() {
+ return thePanel;
+ }
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/util/POPWithButtons.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/util/POPWithButtons.java 2009-05-17 11:59:58 UTC (rev 960)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/util/POPWithButtons.java 2009-05-17 20:28:24 UTC (rev 961)
@@ -49,7 +49,7 @@
public class POPWithButtons extends JPanel
implements PropertyChangeListener {
- private AbstractPropertiedObjectPanelHolder thePanel;
+ private ExpertPropertiedObjectPanelHolder thePanel;
private PropertiedObjectEditor theEditor;
private AbstractButton applyButton;
private AbstractButton resetButton;
@@ -59,7 +59,7 @@
defsMap = new HashMap();
private POPWithButtonsController controller;
- public POPWithButtons(AbstractPropertiedObjectPanelHolder pnl,
+ public POPWithButtons(ExpertPropertiedObjectPanelHolder pnl,
PropertiedObjectEditor edtr,
POPWithButtonsController ctrlr) {
super();
@@ -74,7 +74,7 @@
public POPWithButtons(PropertiedObjectPanel pnl,
PropertiedObjectEditor editor, POPWithButtonsController controller) {
- this(new PropertiedObjectPanelHolder(pnl, null), editor, controller);
+ this(new ExpertPropertiedObjectPanelHolder(pnl, null), editor, controller);
}
private void init() {
Deleted: trunk/console/src/main/java/com/metamatrix/console/ui/util/PropertiedObjectPanelHolder.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/util/PropertiedObjectPanelHolder.java 2009-05-17 11:59:58 UTC (rev 960)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/util/PropertiedObjectPanelHolder.java 2009-05-17 20:28:24 UTC (rev 961)
@@ -1,70 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership. Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-package com.metamatrix.console.ui.util;
-
-import java.awt.BorderLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ItemListener;
-
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-
-import com.metamatrix.toolbox.ui.widget.CheckBox;
-import com.metamatrix.toolbox.ui.widget.property.PropertiedObjectPanel;
-
-public class PropertiedObjectPanelHolder extends AbstractPropertiedObjectPanelHolder {
- public PropertiedObjectPanelHolder(PropertiedObjectPanel pnl,
- ItemListener checkBoxChangeListener) {
- super(pnl);
- init(checkBoxChangeListener);
- }
-
- private void init(ItemListener checkBoxChangeListener) {
- setBorder(BorderFactory.createEtchedBorder());
- GridBagLayout layout = new GridBagLayout();
- setLayout(layout);
- add(thePanel);
- layout.setConstraints(thePanel, new GridBagConstraints(0, 1, 1, 1, 1.0, 1.0,
- GridBagConstraints.CENTER, GridBagConstraints.BOTH,
- new Insets(2, 2, 2, 2), 0, 0));
- JPanel topPanel = new JPanel();
- add(topPanel);
-
- topPanel.setLayout(new BorderLayout());
-
- if (checkBoxChangeListener != null) {
- optionalPropertiesCheckBox = new CheckBox("Include optional properties"); //$NON-NLS-1$
- optionalPropertiesCheckBox.addItemListener(checkBoxChangeListener);
- topPanel.add(optionalPropertiesCheckBox, BorderLayout.EAST);
- layout.setConstraints(topPanel, new GridBagConstraints(0, 0, 1, 1,
- 0.0, 0.0, GridBagConstraints.CENTER,
- GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
- } else {
- layout.setConstraints(topPanel, new GridBagConstraints(0, 0, 1, 1,
- 0.0, 0.0, GridBagConstraints.CENTER,
- GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
- }
- }
-}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/authorization/AuthenticationProviderPropertiesPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/authorization/AuthenticationProviderPropertiesPanel.java 2009-05-17 11:59:58 UTC (rev 960)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/authorization/AuthenticationProviderPropertiesPanel.java 2009-05-17 20:28:24 UTC (rev 961)
@@ -187,7 +187,6 @@
getPropertiedObjectPanel().setShowInvalidProperties(true);
getPropertiedObjectPanel().setShowHiddenProperties(false);
getPropertiedObjectPanel().setShowExpertProperties(false);
- getPropertiedObjectPanel().setShowOptionalProperties(true);
if (!canModify) {
getPropertiedObjectPanel().setReadOnlyForced(true);
@@ -208,13 +207,7 @@
}
};
- ItemListener includeOptionalListener = new ItemListener() {
- public void itemStateChanged(ItemEvent ev) {
- includeOptionalStateChanged();
- }
- };
-
- popHolder = new ExpertPropertiedObjectPanelHolder(pop, includeExpertListener, includeOptionalListener);
+ popHolder = new ExpertPropertiedObjectPanelHolder(pop, includeExpertListener);
popWithButtons = new POPWithButtons(popHolder, poe, this);
pnlPOPShell.add(popWithButtons);
@@ -234,12 +227,6 @@
getPropertiedObjectPanel().refreshDisplay();
}
- private void includeOptionalStateChanged() {
- getPropertiedObjectPanel().setShowOptionalProperties(
- popHolder.isIncludingOptionalProperties());
- getPropertiedObjectPanel().refreshDisplay();
- }
-
public ComponentDefn getNewProvider() {
return providerDefn;
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/authorization/NewAuthenticationProviderSpecificationPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/authorization/NewAuthenticationProviderSpecificationPanel.java 2009-05-17 11:59:58 UTC (rev 960)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/authorization/NewAuthenticationProviderSpecificationPanel.java 2009-05-17 20:28:24 UTC (rev 961)
@@ -208,7 +208,6 @@
popThePanel.setShowInvalidProperties(true);
popThePanel.setShowHiddenProperties(false);
popThePanel.setShowExpertProperties(false);
- popThePanel.setShowOptionalProperties(true);
popThePanel.refreshDisplay();
popThePanel.createComponent();
@@ -221,14 +220,8 @@
}
};
- ItemListener includeOptionalListener = new ItemListener() {
- public void itemStateChanged(ItemEvent ev) {
- includeOptionalStateChanged();
- }
- };
- popHolder = new ExpertPropertiedObjectPanelHolder(popThePanel, includeExpertListener, includeOptionalListener);
+ popHolder = new ExpertPropertiedObjectPanelHolder(popThePanel, includeExpertListener);
popHolder.setIsIncludingExpertProperties(false);
- popHolder.setIsIncludingOptionalProperties(true);
pnlPOPShell.add(popHolder);
setInitialValues();
@@ -249,11 +242,6 @@
popThePanel.refreshDisplay();
}
- private void includeOptionalStateChanged() {
- popThePanel.setShowOptionalProperties(popHolder.isIncludingOptionalProperties());
- popThePanel.refreshDisplay();
- }
-
public AuthenticationProvider getNewAuthenticationProvider() {
return scdNewAuthenticationProvider;
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbinding/BindingPropertiesPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbinding/BindingPropertiesPanel.java 2009-05-17 11:59:58 UTC (rev 960)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbinding/BindingPropertiesPanel.java 2009-05-17 20:28:24 UTC (rev 961)
@@ -52,7 +52,7 @@
public class BindingPropertiesPanel extends JPanel
implements POPWithButtonsController {
private PropertiedObjectPanel pop;
- private PropertiedObjectPanelHolder popHolder;
+ private ExpertPropertiedObjectPanelHolder popHolder;
private POPWithButtons popWithButtons = null;
private TextFieldWidget txfConnectorName = new TextFieldWidget();
@@ -177,7 +177,6 @@
getPropertiedObjectPanel().setShowInvalidProperties(true);
getPropertiedObjectPanel().setShowHiddenProperties(false);
getPropertiedObjectPanel().setShowExpertProperties(true);
- getPropertiedObjectPanel().setShowOptionalProperties(false);
if (!canModify) {
getPropertiedObjectPanel().setReadOnlyForced(true);
@@ -186,23 +185,23 @@
getPropertiedObjectPanel().createComponent();
getPropertiedObjectPanel().refreshDisplay();
- boolean includeOptional = false;
+ boolean includeExpert = false;
if (popHolder != null) {
- includeOptional = popHolder.isIncludingOptionalProperties();
+ includeExpert = popHolder.isIncludingExpertProperties();
}
pnlPOPShell.removeAll();
ItemListener includeOptionalListener = new ItemListener() {
public void itemStateChanged(ItemEvent ev) {
- includeOptionalStateChanged();
+ includeExpertStateChanged();
}
};
- popHolder = new PropertiedObjectPanelHolder(pop, includeOptionalListener);
+ popHolder = new ExpertPropertiedObjectPanelHolder(pop, includeOptionalListener);
popWithButtons = new POPWithButtons(popHolder, poe, this);
pnlPOPShell.add(popWithButtons);
- popHolder.setIsIncludingOptionalProperties(includeOptional);
+ popHolder.setIsIncludingExpertProperties(includeExpert);
} catch(Exception e) {
ExceptionUtility.showMessage("Failed while creating Connector Binding Panel", //$NON-NLS-1$
@@ -211,9 +210,9 @@
}
- private void includeOptionalStateChanged() {
- getPropertiedObjectPanel().setShowOptionalProperties(
- popHolder.isIncludingOptionalProperties());
+ private void includeExpertStateChanged() {
+ getPropertiedObjectPanel().setShowExpertProperties(
+ popHolder.isIncludingExpertProperties());
getPropertiedObjectPanel().refreshDisplay();
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbinding/NewBindingWizardSpecificationPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbinding/NewBindingWizardSpecificationPanel.java 2009-05-17 11:59:58 UTC (rev 960)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbinding/NewBindingWizardSpecificationPanel.java 2009-05-17 20:28:24 UTC (rev 961)
@@ -52,8 +52,8 @@
import com.metamatrix.console.models.ModelManager;
import com.metamatrix.console.ui.layout.ConsoleMainFrame;
import com.metamatrix.console.ui.util.BasicWizardSubpanelContainer;
+import com.metamatrix.console.ui.util.ExpertPropertiedObjectPanelHolder;
import com.metamatrix.console.ui.util.InitialAndCurrentValues;
-import com.metamatrix.console.ui.util.PropertiedObjectPanelHolder;
import com.metamatrix.console.ui.util.WizardInterface;
import com.metamatrix.console.util.ExceptionUtility;
import com.metamatrix.console.util.StaticUtilities;
@@ -202,7 +202,6 @@
popThePanel.setShowInvalidProperties(true);
popThePanel.setShowHiddenProperties(false);
popThePanel.setShowExpertProperties(true);
- popThePanel.setShowOptionalProperties(false);
popThePanel.refreshDisplay();
popThePanel.createComponent();
@@ -212,10 +211,10 @@
ItemListener popChangeListener = new ItemListener() {
public void itemStateChanged(ItemEvent ev) {
- includeOptionalsChanged(ev);
+ includeExpertChanged(ev);
}
};
- pnlPOPShell.add(new PropertiedObjectPanelHolder(popThePanel, popChangeListener));
+ pnlPOPShell.add(new ExpertPropertiedObjectPanelHolder(popThePanel, popChangeListener));
setInitialValues();
popThePanel.addPropertyChangeListener(this);
@@ -230,9 +229,9 @@
}
}
- private void includeOptionalsChanged(ItemEvent ev) {
+ private void includeExpertChanged(ItemEvent ev) {
CheckBox cb = (CheckBox)ev.getSource();
- popThePanel.setShowOptionalProperties(cb.isSelected());
+ popThePanel.setShowExpertProperties(cb.isSelected());
popThePanel.refreshDisplay();
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/ServiceDefinitionPropertiesPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/ServiceDefinitionPropertiesPanel.java 2009-05-17 11:59:58 UTC (rev 960)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/ServiceDefinitionPropertiesPanel.java 2009-05-17 20:28:24 UTC (rev 961)
@@ -42,14 +42,12 @@
import com.metamatrix.console.models.ConfigurationPropertiedObjectEditor;
import com.metamatrix.console.models.ModelManager;
import com.metamatrix.console.ui.layout.ConsoleMainFrame;
+import com.metamatrix.console.ui.util.ExpertPropertiedObjectPanelHolder;
import com.metamatrix.console.ui.util.POPWithButtons;
import com.metamatrix.console.ui.util.POPWithButtonsController;
-import com.metamatrix.console.ui.util.PropertiedObjectPanelHolder;
import com.metamatrix.console.util.ExceptionUtility;
import com.metamatrix.console.util.LogContexts;
import com.metamatrix.console.util.StaticUtilities;
-import com.metamatrix.toolbox.ui.widget.LabelWidget;
-import com.metamatrix.toolbox.ui.widget.TextFieldWidget;
import com.metamatrix.toolbox.ui.widget.property.PropertiedObjectPanel;
@@ -57,7 +55,7 @@
public class ServiceDefinitionPropertiesPanel extends JPanel
implements POPWithButtonsController {
private PropertiedObjectPanel pop;
- private PropertiedObjectPanelHolder popHolder;
+ private ExpertPropertiedObjectPanelHolder popHolder;
private POPWithButtons popWithButtons = null;
// private TextFieldWidget txfServiceName = new TextFieldWidget();
@@ -182,7 +180,6 @@
getPropertiedObjectPanel().setShowInvalidProperties(true);
getPropertiedObjectPanel().setShowHiddenProperties(false);
getPropertiedObjectPanel().setShowExpertProperties(true);
- getPropertiedObjectPanel().setShowOptionalProperties(false);
if (!canModify) {
getPropertiedObjectPanel().setReadOnlyForced(true);
@@ -191,23 +188,23 @@
getPropertiedObjectPanel().createComponent();
getPropertiedObjectPanel().refreshDisplay();
- boolean includeOptional = false;
+ boolean includeExpert = false;
if (popHolder != null) {
- includeOptional = popHolder.isIncludingOptionalProperties();
+ includeExpert = popHolder.isIncludingExpertProperties();
}
pnlPOPShell.removeAll();
- ItemListener includeOptionalListener = new ItemListener() {
+ ItemListener includeExpertListener = new ItemListener() {
public void itemStateChanged(ItemEvent ev) {
includeOptionalStateChanged();
}
};
- popHolder = new PropertiedObjectPanelHolder(pop, includeOptionalListener);
+ popHolder = new ExpertPropertiedObjectPanelHolder(pop, includeExpertListener);
popWithButtons = new POPWithButtons(popHolder, poe, this);
pnlPOPShell.add(popWithButtons);
- popHolder.setIsIncludingOptionalProperties(includeOptional);
+ popHolder.setIsIncludingExpertProperties(includeExpert);
} catch(Exception e) {
ExceptionUtility.showMessage("Failed while creating Service Definition Panel", //$NON-NLS-1$
@@ -217,8 +214,8 @@
}
private void includeOptionalStateChanged() {
- getPropertiedObjectPanel().setShowOptionalProperties(
- popHolder.isIncludingOptionalProperties());
+ getPropertiedObjectPanel().setShowExpertProperties(
+ popHolder.isIncludingExpertProperties());
getPropertiedObjectPanel().refreshDisplay();
}
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 11:59:58 UTC (rev 960)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/properties/ConsolePropertyObjectId.java 2009-05-17 20:28:24 UTC (rev 961)
@@ -115,50 +115,18 @@
}
}
- else {
- //ystem.out.println("Not find groupPropertyDefination,should call getPropertyDefinitions in ConsolePropertiedEditor to gain groupPropertyDefination");
- }
-
}
private ArrayList filterBEpropDefns(Collection pd){
ArrayList propDefnsBE = new ArrayList();
- if (isBasicProperties()){
- Iterator iter = pd.iterator();
- while ( iter.hasNext()){
- PropertyDefinition propDefn = (PropertyDefinition)iter.next();
- if (!propDefn.isExpert()){
- if(!propDefnsBE.contains(propDefn)){
- propDefnsBE.add(propDefn);
- }
- }
+ Iterator iter = pd.iterator();
+ while ( iter.hasNext()){
+ PropertyDefinition propDefn = (PropertyDefinition)iter.next();
+ boolean expert = propDefn.isExpert() && !propDefn.isRequired();
+ if(((expert && isExpertProperties()) || (!expert && !isExpertProperties()) || isBothBEProperties()) && !propDefnsBE.contains(propDefn)){
+ propDefnsBE.add(propDefn);
}
- return propDefnsBE;
}
-
- if (isExpertProperties()){
- Iterator iter = pd.iterator();
- while ( iter.hasNext()){
- PropertyDefinition propDefn = (PropertyDefinition)iter.next();
- if (propDefn.isExpert()){
- if(!propDefnsBE.contains(propDefn)){
- propDefnsBE.add(propDefn);
- }
- }
- }
- return propDefnsBE;
- }
-
- if (isBothBEProperties()){
- Iterator iter = pd.iterator();
- while ( iter.hasNext()){
- PropertyDefinition propDefn = (PropertyDefinition)iter.next();
- if(!propDefnsBE.contains(propDefn)){
- propDefnsBE.add(propDefn);
- }
- }
- return propDefnsBE;
- }
return propDefnsBE;
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/resources/ResourcesMainPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/resources/ResourcesMainPanel.java 2009-05-17 11:59:58 UTC (rev 960)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/resources/ResourcesMainPanel.java 2009-05-17 20:28:24 UTC (rev 961)
@@ -56,9 +56,9 @@
import com.metamatrix.console.ui.layout.BasePanel;
import com.metamatrix.console.ui.layout.ConsoleMainFrame;
import com.metamatrix.console.ui.layout.WorkspacePanel;
+import com.metamatrix.console.ui.util.ExpertPropertiedObjectPanelHolder;
import com.metamatrix.console.ui.util.POPWithButtons;
import com.metamatrix.console.ui.util.POPWithButtonsController;
-import com.metamatrix.console.ui.util.PropertiedObjectPanelHolder;
import com.metamatrix.console.ui.views.DefaultConsoleTableComparator;
import com.metamatrix.console.util.DialogUtility;
import com.metamatrix.console.util.ExceptionUtility;
@@ -146,7 +146,7 @@
pop = new PropertiedObjectPanel(rpoe, manager.getEncryptor());
pop.setReadOnlyForced(!canModify);
pop.createComponent();
- PropertiedObjectPanelHolder popHolder = new PropertiedObjectPanelHolder(
+ ExpertPropertiedObjectPanelHolder popHolder = new ExpertPropertiedObjectPanelHolder(
pop, null);
popWithButtons = new POPWithButtons(popHolder, rpoe, this);
popWithButtons.setButtonsVisible(canModify);
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 11:59:58 UTC (rev 960)
+++ trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/property/PropertiedObjectPanel.java 2009-05-17 20:28:24 UTC (rev 961)
@@ -86,6 +86,7 @@
*/
public class PropertiedObjectPanel extends JPanel
implements UIConstants {
+
//############################################################################################################################
//# Constants #
//############################################################################################################################
@@ -140,7 +141,6 @@
private boolean showToolTips = true;
private boolean showRequired = false;
private boolean showInvalid = false;
- private boolean showOptional = true;
private boolean readOnlyForced = false;
private Collection propertiesToFilterOut = Collections.EMPTY_LIST;
@@ -651,26 +651,20 @@
Iterator iter = defs.iterator();
while ( iter.hasNext() ) {
PropertyDefinition def = (PropertyDefinition) iter.next();
- boolean addToList = true;
- if ( ! showExpert && def.isExpert() ) {
- addToList = false;
+ if ( ! showHidden && (def.isHidden() || !def.isModifiable())) {
+ continue;
}
- if ( ! showHidden && def.isHidden() ) {
- addToList = false;
+ if ( ! showExpert && def.isExpert() && !def.isRequired() ) {
+ continue;
}
- if (!showOptional && !def.isRequired()) {
- addToList = false;
- }
if ( propertiesToFilterOut.contains(def) ) {
- addToList = false;
+ continue;
}
// Skip read-only password fields
if (def.isMasked() && (readOnlyForced || !def.isModifiable() || editor.isReadOnly(propObj))) {
- addToList = false;
+ continue;
}
- if ( addToList ) {
- result.add(def);
- }
+ result.add(def);
}
return result;
}
@@ -795,13 +789,6 @@
/**
@since 2.0
*/
- public boolean getShowOptionalProperties() {
- return showOptional;
- }
-
- /**
- @since 2.0
- */
public boolean getShowRequiredProperties() {
return showRequired;
}
@@ -1198,15 +1185,6 @@
}
/**
- Sets whether properties not marked as required (i.e., optional properties) should be shown.
- @param show True if optional properties should be shown. The default is true.
- @since 2.0
- */
- public void setShowOptionalProperties(final boolean show) {
- showOptional = show;
- }
-
- /**
Sets whether properties marked as required should be shown with a special indication.
@param showRequired True if required properties should be shown. The default is false.
@since 2.0
More information about the teiid-commits
mailing list