Author: bobtarling
Date: 2008-10-02 17:17:47-0700
New Revision: 15869
Added:
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBox.java
- copied, changed from r15868, /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBox3.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBoxModel.java
- copied, changed from r15868, /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBoxModel3.java
Removed:
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBox3.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBoxModel3.java
Modified:
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBox2.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBoxModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBox.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBoxModel.java
Log:
Reduce visibility of classes unused outside of package.
There is no need to number UMLComboBox3/UMLComboBoxModel3.
Reduce some warnings.
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java?view=diff&rev=15869&p1=trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java&p2=trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java&r1=15868&r2=15869
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java 2008-10-02 17:17:47-0700
@@ -1125,7 +1125,7 @@
comp = mPanel;
}
else if ("activator".equals(prop.getName())) {
- final UMLComboBoxModel3 model =
+ final UMLComboBoxModel model =
new UMLMessageActivatorComboBoxModel();
model.setTarget(target);
final JComboBox combo = new UMLMessageActivatorComboBox(model);
@@ -1142,10 +1142,10 @@
combo);
}
else {
- final UMLComboBoxModel3 model =
+ final UMLComboBoxModel model =
new UMLCallActionOperationComboBoxModel();
model.setTarget(target);
- UMLComboBox3 operationComboBox =
+ UMLComboBox operationComboBox =
new UMLCallActionOperationComboBox2(model);
comp = new UMLComboBoxNavigator(
Translator.localize("label.operation.navigate.tooltip"),
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBox2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBox2.java?view=diff&rev=15869&p1=trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBox2.java&p2=trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBox2.java&r1=15868&r2=15869
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBox2.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBox2.java 2008-10-02 17:17:47-0700
@@ -33,13 +33,13 @@
import org.tigris.gef.undo.UndoableAction;
class UMLCallActionOperationComboBox2
- extends UMLComboBox3 {
+ extends UMLComboBox {
/**
* The constructor.
*
* @param arg0 the model
*/
- public UMLCallActionOperationComboBox2(UMLComboBoxModel3 arg0) {
+ public UMLCallActionOperationComboBox2(UMLComboBoxModel arg0) {
super(arg0, new SetActionOperationAction());
setEditable(false);
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBoxModel.java?view=diff&rev=15869&p1=trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBoxModel.java&p2=trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBoxModel.java&r1=15868&r2=15869
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBoxModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBoxModel.java 2008-10-02 17:17:47-0700
@@ -33,7 +33,7 @@
import org.argouml.model.Model;
import org.argouml.ui.targetmanager.TargetManager;
-class UMLCallActionOperationComboBoxModel extends UMLComboBoxModel3 {
+class UMLCallActionOperationComboBoxModel extends UMLComboBoxModel {
/**
* The constructor.
*/
Copied: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBox.java (from r15868, /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBox3.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBox.java?view=diff&rev=15869&p1=/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBox3.java&p2=trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBox.java&r1=15868&r2=15869
==============================================================================
--- /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBox3.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBox.java 2008-10-02 17:17:47-0700
@@ -28,8 +28,6 @@
import javax.swing.Action;
import javax.swing.JComboBox;
-import javax.swing.event.PopupMenuEvent;
-import javax.swing.event.PopupMenuListener;
import org.apache.log4j.Logger;
import org.argouml.ui.LookAndFeelMgr;
@@ -47,12 +45,10 @@
* UMLComboBox. The ancient UMLComboBoxModel and UMLComboBox are
* replaced with this implementation to improve performance.
*/
-public class UMLComboBox3
+class UMLComboBox
extends JComboBox
implements TargettableModelView, TargetListener {
- private static final Logger LOG = Logger.getLogger(UMLComboBox3.class);
-
/**
* Constructor for UMLComboBox2.
* @deprecated As of ArgoUml version unknown (before 0.13.5),
@@ -60,7 +56,7 @@
* @param model the ComboBoxModel
*/
@Deprecated
- protected UMLComboBox3(UMLComboBoxModel3 model) {
+ protected UMLComboBox(UMLComboBoxModel model) {
super(model);
setFont(LookAndFeelMgr.getInstance().getStandardFont());
addActionListener(this);
@@ -74,7 +70,7 @@
* @param action the action
* @param showIcon true if an icon should be shown in front of the items
*/
- public UMLComboBox3(UMLComboBoxModel3 model, Action action,
+ public UMLComboBox(UMLComboBoxModel model, Action action,
boolean showIcon) {
super(model);
//setFont(LookAndFeelMgr.getInstance().getStandardFont());
@@ -90,13 +86,11 @@
* @param arg0 the ComboBoxModel
* @param action the action
*/
- public UMLComboBox3(UMLComboBoxModel3 arg0, Action action) {
+ public UMLComboBox(UMLComboBoxModel arg0, Action action) {
this(arg0, action, true);
}
- /*
- * @see java.awt.event.ActionListener#actionPerformed(ActionEvent)
- */
+ @Override
public void actionPerformed(ActionEvent arg0) {
int i = getSelectedIndex();
if (i >= 0) {
@@ -118,7 +112,7 @@
* @return Object
*/
public Object getTarget() {
- return ((UMLComboBoxModel3) getModel()).getTarget();
+ return ((UMLComboBoxModel) getModel()).getTarget();
}
Removed: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBox3.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBox3.java?view=auto&rev=15868
Copied: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBoxModel.java (from r15868, /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBoxModel3.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBoxModel.java?view=diff&rev=15869&p1=/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBoxModel3.java&p2=trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBoxModel.java&r1=15868&r2=15869
==============================================================================
--- /trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBoxModel3.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBoxModel.java 2008-10-02 17:17:47-0700
@@ -55,14 +55,14 @@
* This combobox allows selecting no value, if so indicated
* at construction time of this class. I.e. it is "clearable".
*/
-public abstract class UMLComboBoxModel3 extends AbstractListModel
+abstract class UMLComboBoxModel extends AbstractListModel
implements PropertyChangeListener,
ComboBoxModel, TargetListener, PopupMenuListener {
/**
* Logger.
*/
private static final Logger LOG =
- Logger.getLogger(UMLComboBoxModel3.class);
+ Logger.getLogger(UMLComboBoxModel.class);
/**
* The target of the comboboxmodel. This is some UML modelelement
@@ -126,7 +126,7 @@
* user has the opportunity to select this to clear the attribute.
* @throws IllegalArgumentException if one of the arguments is null
*/
- public UMLComboBoxModel3(String name, boolean clearable) {
+ public UMLComboBoxModel(String name, boolean clearable) {
super();
if (name == null || name.equals("")) {
throw new IllegalArgumentException("one of the arguments is null");
Removed: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBoxModel3.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBoxModel3.java?view=auto&rev=15868
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBox.java?view=diff&rev=15869&p1=trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBox.java&p2=trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBox.java&r1=15868&r2=15869
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBox.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBox.java 2008-10-02 17:17:47-0700
@@ -37,7 +37,7 @@
* combobox serves as a proxy for the
* model (UMLMessageActivatorComboBoxModel). Kind of strange...
*/
-public class UMLMessageActivatorComboBox extends UMLComboBox3 {
+public class UMLMessageActivatorComboBox extends UMLComboBox {
/**
* Constructor for UMLMessageActivatorComboBox.
@@ -45,7 +45,7 @@
* @param arg0 the model
*/
public UMLMessageActivatorComboBox(
- UMLComboBoxModel3 arg0) {
+ UMLComboBoxModel arg0) {
// TODO: This super constructor has been deprecated
super(arg0);
setRenderer(new UMLListCellRenderer2(true));
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBoxModel.java?view=diff&rev=15869&p1=trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBoxModel.java&p2=trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBoxModel.java&r1=15868&r2=15869
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBoxModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBoxModel.java 2008-10-02 17:17:47-0700
@@ -30,7 +30,7 @@
/**
* The model behind the UMLMessageActivatorComboBox.
*/
-public class UMLMessageActivatorComboBoxModel extends UMLComboBoxModel3 {
+public class UMLMessageActivatorComboBoxModel extends UMLComboBoxModel {
private Object interaction = null;
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.