Author: bobtarling Date: 2011-05-15 11:02:18-0700 New Revision: 19430 Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationPanelOptional.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueField.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueFieldLiteralBoolean.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueFieldLiteralString.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueFieldOpaqueExpression.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueFieldOpaqueExpressionDialog.java
Log: Make classes package scope - Use BorderLayout in UMLValueSpecificationPanelOptional Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationPanelOptional.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationPanelOptional.java?view=diff&pathrev=19430&r1=19429&r2=19430 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationPanelOptional.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationPanelOptional.java 2011-05-15 11:02:18-0700 @@ -13,8 +13,7 @@ package org.argouml.core.propertypanels.ui; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; +import java.awt.BorderLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -25,7 +24,6 @@ import javax.swing.event.ChangeListener; import org.apache.log4j.Logger; -import org.tigris.swidgets.LabelledLayout; /** * Checkbox creates or nulls the instance of valueSpecificationPanel @@ -34,7 +32,7 @@ * * Do we need : ChangeListener */ -public class UMLValueSpecificationPanelOptional extends JPanel implements +class UMLValueSpecificationPanelOptional extends JPanel implements ChangeListener { private static final Logger LOG = Logger @@ -58,8 +56,7 @@ public UMLValueSpecificationPanelOptional( UMLValueSpecificationModel aModel, String title) { - // super(new LabelledLayout()); - super(new GridBagLayout()); + super(new BorderLayout()); LOG.debug(">>New Optional ValueSpecification panel created"); @@ -97,20 +94,8 @@ uvsPanel = new UMLValueSpecificationPanel(model, ""); uvsPanel.setVisible(valueExists.isSelected()); - GridBagConstraints c = new GridBagConstraints(); - c.fill = GridBagConstraints.NONE; - c.gridx = 0; - c.gridy = 0; - c.weightx = 0; - c.weighty = 0; - add(valueExists, c); - - c.fill = GridBagConstraints.BOTH; - c.gridx = 1; - c.gridy = 0; - c.weightx = 1; - c.weighty = 1; - add(uvsPanel, c); + add(valueExists, BorderLayout.WEST); + add(uvsPanel, BorderLayout.CENTER); model.addChangeListener(this); Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueField.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueField.java?view=diff&pathrev=19430&r1=19429&r2=19430 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueField.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueField.java 2011-05-15 11:02:18-0700 @@ -18,7 +18,7 @@ import org.apache.log4j.Logger; -public abstract class UMLValueSpecificationValueField { +abstract class UMLValueSpecificationValueField { /** * TODO: see if protected or need to be present in each subclass Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueFieldLiteralBoolean.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueFieldLiteralBoolean.java?view=diff&pathrev=19430&r1=19429&r2=19430 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueFieldLiteralBoolean.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueFieldLiteralBoolean.java 2011-05-15 11:02:18-0700 @@ -24,7 +24,7 @@ import org.argouml.i18n.Translator; import org.argouml.ui.LookAndFeelMgr; -public class UMLValueSpecificationValueFieldLiteralBoolean extends +class UMLValueSpecificationValueFieldLiteralBoolean extends UMLValueSpecificationValueField { private JRadioButton trueButton; Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueFieldLiteralString.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueFieldLiteralString.java?view=diff&pathrev=19430&r1=19429&r2=19430 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueFieldLiteralString.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueFieldLiteralString.java 2011-05-15 11:02:18-0700 @@ -20,7 +20,7 @@ import org.argouml.ui.LookAndFeelMgr; -public class UMLValueSpecificationValueFieldLiteralString extends +class UMLValueSpecificationValueFieldLiteralString extends UMLValueSpecificationValueField implements DocumentListener { /** Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueFieldOpaqueExpression.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueFieldOpaqueExpression.java?view=diff&pathrev=19430&r1=19429&r2=19430 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueFieldOpaqueExpression.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueFieldOpaqueExpression.java 2011-05-15 11:02:18-0700 @@ -39,7 +39,7 @@ * * @author Laurent Braud */ -public class UMLValueSpecificationValueFieldOpaqueExpression extends +class UMLValueSpecificationValueFieldOpaqueExpression extends UMLValueSpecificationValueField implements DocumentListener { /** Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueFieldOpaqueExpressionDialog.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueFieldOpaqueExpressionDialog.java?view=diff&pathrev=19430&r1=19429&r2=19430 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueFieldOpaqueExpressionDialog.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLValueSpecificationValueFieldOpaqueExpressionDialog.java 2011-05-15 11:02:18-0700 @@ -40,7 +40,7 @@ * TODO ? Review the layout * */ -public class UMLValueSpecificationValueFieldOpaqueExpressionDialog extends +class UMLValueSpecificationValueFieldOpaqueExpressionDialog extends ArgoDialog { /** ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2737590 To unsubscribe from this discussion, e-mail: [[email protected]].
