Modeler cleanup

Author: andrus

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/DataMapEvent.java

@@ -28,39 +28,24 @@
 public class DataMapEvent extends MapEvent {
 	protected DataMap dataMap;
 
-	/** Creates a DataMap change event. */
 	public DataMapEvent(Object src, DataMap dataMap) {
 		super(src);
 		this.dataMap = dataMap;
 	}
 
-	/** Creates a DataMap event of a specified type. */
 	public DataMapEvent(Object src, DataMap dataMap, int id) {
 		this(src, dataMap);
 		setId(id);
 	}
 
-	/** Creates a DataMap name change event.*/
 	public DataMapEvent(Object src, DataMap dataMap, String oldName) {
 		this(src, dataMap);
 		setOldName(oldName);
 	}
 
-	/** 
-	 * Returns DataMap associated with this event. 
-	 */
 	public DataMap getDataMap() {
 		return dataMap;
 	}
-	
-	/**
-	 * Sets DataMap associated with this event.
-	 * 
-	 * @param dataMap The dataMap to set
-	 */
-	public void setDataMap(DataMap dataMap) {
-		this.dataMap = dataMap;
-	}
 
     @Override
     public String getNewName() {

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/DataMapListener.java

@@ -26,19 +26,10 @@
  */
 public interface DataMapListener extends EventListener {
 
-    /**
-     * Called on DataMap property changes. 
-     */
-    public void dataMapChanged(DataMapEvent e);
+    void dataMapChanged(DataMapEvent e);
 
-    /** 
-     * Called when a new DataMap is added.
-     */
-    public void dataMapAdded(DataMapEvent e);
+    void dataMapAdded(DataMapEvent e);
 
-    /** 
-     * Called when a DataMap is removed.
-     */
-    public void dataMapRemoved(DataMapEvent e);
+    void dataMapRemoved(DataMapEvent e);
 
 }

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/DataNodeListener.java

@@ -21,15 +21,24 @@
 
 import java.util.EventListener;
 
-/** For managing the changes in the DataNode */
-public interface DataNodeListener extends EventListener
-{
-	/** DataNode property (usually - name) changed. */
-	public void dataNodeChanged(DataNodeEvent e);
-	/** New data map has been created/added.*/
-	public void dataNodeAdded(DataNodeEvent e);
-	/** DataNode has been removed.*/
-	public void dataNodeRemoved(DataNodeEvent e);
-	
+/**
+ * For managing the changes in the DataNode
+ */
+public interface DataNodeListener extends EventListener {
+    /**
+     * DataNode property (usually - name) changed.
+     */
+    void dataNodeChanged(DataNodeEvent e);
+
+    /**
+     * New data map has been created/added.
+     */
+    void dataNodeAdded(DataNodeEvent e);
+
+    /**
+     * DataNode has been removed.
+     */
+    void dataNodeRemoved(DataNodeEvent e);
+
 }
 

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/DomainListener.java

@@ -21,11 +21,14 @@
 
 import java.util.EventListener;
 
-/** For managing the changes in the Domain */
-public interface DomainListener extends EventListener
-{
-	/** Domain property (usually - name) changed. */
-	public void domainChanged(DomainEvent e);
-	
+/**
+ * For managing the changes in the Domain
+ */
+public interface DomainListener extends EventListener {
+    /**
+     * Domain property (usually - name) changed.
+     */
+    void domainChanged(DomainEvent e);
+
 }
 

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/ProcedureListener.java

@@ -21,23 +21,23 @@
 
 import java.util.EventListener;
 
-/** 
+/**
  * Listener for Procedure events.
- * 
+ *
  */
 public interface ProcedureListener extends EventListener {
-    /** 
-     * Procedure changed. 
+    /**
+     * Procedure changed.
      */
-    public void procedureChanged(ProcedureEvent e);
+    void procedureChanged(ProcedureEvent e);
 
-    /** 
-     * New Procedure has been created. 
+    /**
+     * New Procedure has been created.
      */
-    public void procedureAdded(ProcedureEvent e);
+    void procedureAdded(ProcedureEvent e);
 
-    /** 
+    /**
      * Procedure has been removed.
      */
-    public void procedureRemoved(ProcedureEvent e);
+    void procedureRemoved(ProcedureEvent e);
 }

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/ProcedureParameterEvent.java

@@ -32,14 +32,6 @@ public ProcedureParameterEvent(Object source, ProcedureParameter parameter) {
         setParameter(parameter);
     }
 
-    public ProcedureParameterEvent(
-        Object source,
-        ProcedureParameter parameter,
-        String oldName) {
-        this(source, parameter);
-        setOldName(oldName);
-    }
-
     public ProcedureParameterEvent(
         Object source,
         ProcedureParameter parameter,

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/ProcedureParameterListener.java

@@ -21,23 +21,23 @@
 
 import java.util.EventListener;
 
-/** 
+/**
  * Listener for ProcedureParameterEvents.
- * 
+ *
  */
 public interface ProcedureParameterListener extends EventListener {
-    /** 
-      *  Called when procedure parameter has changed. 
-      */
-    public void procedureParameterChanged(ProcedureParameterEvent e);
+    /**
+     * Called when procedure parameter has changed.
+     */
+    void procedureParameterChanged(ProcedureParameterEvent e);
 
-    /** 
-     *  Called when new procedure parameter has been created. 
+    /**
+     * Called when new procedure parameter has been created.
      */
-    public void procedureParameterAdded(ProcedureParameterEvent e);
+    void procedureParameterAdded(ProcedureParameterEvent e);
 
-    /** 
+    /**
      * Called when procedure parameter has been removed.
      */
-    public void procedureParameterRemoved(ProcedureParameterEvent e);
+    void procedureParameterRemoved(ProcedureParameterEvent e);
 }

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/QueryListener.java

@@ -23,22 +23,14 @@
 
 /**
  * Listener for QueryEvents.
- * 
+ *
  * @since 1.1
  */
 public interface QueryListener extends EventListener {
-    /** 
-     * Query changed. 
-     */
-    public void queryChanged(QueryEvent e);
 
-    /** 
-     * New Query has been created. 
-     */
-    public void queryAdded(QueryEvent e);
+    void queryChanged(QueryEvent e);
+
+    void queryAdded(QueryEvent e);
 
-    /** 
-     * Query has been removed.
-     */
-    public void queryRemoved(QueryEvent e);
+    void queryRemoved(QueryEvent e);
 }

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/AboutAction.java

@@ -19,30 +19,19 @@
 
 package org.apache.cayenne.modeler.action;
 
-import java.awt.event.ActionEvent;
-
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.dialog.AboutDialog;
 import org.apache.cayenne.modeler.util.CayenneAction;
 
-/**
- */
-public class AboutAction extends CayenneAction {
+import java.awt.event.ActionEvent;
 
-    public static final String getActionName() {
-        return "About CayenneModeler";
-    }
+public class AboutAction extends CayenneAction {
 
-    /**
-     * Constructor for AboutMenuAction.
-     */
     public AboutAction(Application application) {
-        super(getActionName(), application);
+        super("About CayenneModeler", application);
     }
 
-    /**
-     * Displays About dialog.
-     */
+    @Override
     public void performAction(ActionEvent e) {
         showAboutDialog();
     }

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CopyAction.java

@@ -18,15 +18,7 @@
  ****************************************************************/
 package org.apache.cayenne.modeler.action;
 
-import java.awt.Toolkit;
-import java.awt.datatransfer.Clipboard;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-
-import javax.swing.KeyStroke;
-
 import org.apache.cayenne.configuration.ConfigurationNode;
-import org.apache.cayenne.configuration.EmptyConfigurationNodeVisitor;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
@@ -44,9 +36,12 @@
 import org.apache.cayenne.modeler.editor.ObjCallbackMethod;
 import org.apache.cayenne.modeler.util.CayenneAction;
 import org.apache.cayenne.modeler.util.CayenneTransferable;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.util.XMLEncoder;
-import org.apache.cayenne.util.XMLSerializable;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.datatransfer.Clipboard;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 
 /**
  * Action for copying entities, queries etc. into system buffer
@@ -106,13 +101,6 @@ public Object copy(ProjectController mediator) {
         return mediator.getCurrentObject();
     }
 
-    /**
-     * Prints an object in XML format to an output stream
-     */
-    protected void print(XMLEncoder encoder, XMLSerializable object) {
-        object.encodeAsXML(encoder, new EmptyConfigurationNodeVisitor());
-    }
-
     /**
      * Returns <code>true</code> if last object in the path contains a removable object.
      */
@@ -122,7 +110,7 @@ public boolean enableForPath(ConfigurationNode object) {
             return false;
         }
 
-        if (object instanceof DataMap
+        return object instanceof DataMap
                 || object instanceof QueryDescriptor
                 || object instanceof DbEntity
                 || object instanceof ObjEntity
@@ -134,10 +122,6 @@ public boolean enableForPath(ConfigurationNode object) {
                 || object instanceof ObjRelationship
                 || object instanceof ObjCallbackMethod
                 || object instanceof Procedure
-                || object instanceof ProcedureParameter) {
-            return true;
-        }
-
-        return false;
+                || object instanceof ProcedureParameter;
     }
 }