You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by km...@apache.org on 2008/12/28 22:41:55 UTC
svn commit: r729776 - in
/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne:
modeler/ modeler/action/ modeler/dialog/db/ modeler/dialog/pref/
modeler/editor/ modeler/editor/datanode/ modeler/editor/dbentity/
modeler/util/ pr...
Author: kmenard
Date: Sun Dec 28 13:41:54 2008
New Revision: 729776
URL: http://svn.apache.org/viewvc?rev=729776&view=rev
Log:
Replaced a bunch of for loops with Java 5 foreach loops for improved code clarity.
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeModel.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/AbstractRemoveCallbackMethodAction.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAttributeAction.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveProcedureParameterAction.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveRelationshipAction.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DBGeneratorOptions.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DBConnectionInfoEditor.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackListenersTab.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackMethodsTab.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/StringTransferHandler.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/DataSourceEditor.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/PasswordEncoderEditor.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/PKDBGeneratorPanel.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTableModel.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/FileWatchdog.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/MapModel.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerUtil.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PanelFactory.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/HSQLEmbeddedPreferenceService.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/swing/BeanActionBinding.java
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java Sun Dec 28 13:41:54 2008
@@ -491,8 +491,8 @@
* Notifies all listeners that recent file list has changed
*/
public void fireRecentFileListChanged() {
- for (int i = 0; i < recentFileListeners.size(); i++) {
- recentFileListeners.get(i).recentFileListChanged();
+ for (RecentFileListListener recentFileListener : recentFileListeners) {
+ recentFileListener.recentFileListChanged();
}
}
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java Sun Dec 28 13:41:54 2008
@@ -718,9 +718,8 @@
saveState(e);
}
- EventListener[] list = listenerList.getListeners(DomainDisplayListener.class);
- for (int i = 0; i < list.length; i++) {
- DomainDisplayListener temp = (DomainDisplayListener) list[i];
+ for (EventListener listener : listenerList.getListeners(DomainDisplayListener.class)) {
+ DomainDisplayListener temp = (DomainDisplayListener) listener;
temp.currentDomainChanged(e);
}
@@ -745,9 +744,8 @@
removeFromHistory(e);
}
- EventListener[] list = listenerList.getListeners(DomainListener.class);
- for (int i = 0; i < list.length; i++) {
- DomainListener temp = (DomainListener) list[i];
+ for (EventListener listener : listenerList.getListeners(DomainListener.class)) {
+ DomainListener temp = (DomainListener) listener;
switch (e.getId()) {
case MapEvent.ADD:
temp.domainAdded(e);
@@ -791,8 +789,8 @@
}
EventListener[] list = listenerList.getListeners(DataNodeDisplayListener.class);
- for (int i = 0; i < list.length; i++) {
- ((DataNodeDisplayListener) list[i]).currentDataNodeChanged(e);
+ for (EventListener listener : list) {
+ ((DataNodeDisplayListener) listener).currentDataNodeChanged(e);
}
}
@@ -808,9 +806,8 @@
removeFromHistory(e);
}
- EventListener[] list = listenerList.getListeners(DataNodeListener.class);
- for (int i = 0; i < list.length; i++) {
- DataNodeListener temp = (DataNodeListener) list[i];
+ for (EventListener listener : listenerList.getListeners(DataNodeListener.class)) {
+ DataNodeListener temp = (DataNodeListener) listener;
switch (e.getId()) {
case MapEvent.ADD:
temp.dataNodeAdded(e);
@@ -853,8 +850,8 @@
}
EventListener[] list = listenerList.getListeners(DataMapDisplayListener.class);
- for (int i = 0; i < list.length; i++) {
- DataMapDisplayListener temp = (DataMapDisplayListener) list[i];
+ for (EventListener listener : list) {
+ DataMapDisplayListener temp = (DataMapDisplayListener) listener;
temp.currentDataMapChanged(e);
}
}
@@ -871,9 +868,8 @@
removeFromHistory(e);
}
- EventListener[] list = listenerList.getListeners(DataMapListener.class);
- for (int i = 0; i < list.length; i++) {
- DataMapListener listener = (DataMapListener) list[i];
+ for (EventListener eventListener : listenerList.getListeners(DataMapListener.class)) {
+ DataMapListener listener = (DataMapListener) eventListener;
switch (e.getId()) {
case MapEvent.ADD:
listener.dataMapAdded(e);
@@ -907,9 +903,8 @@
removeFromHistory(e);
}
- EventListener[] list = listenerList.getListeners(ObjEntityListener.class);
- for (int i = 0; i < list.length; i++) {
- ObjEntityListener temp = (ObjEntityListener) list[i];
+ for (EventListener listener : listenerList.getListeners(ObjEntityListener.class)) {
+ ObjEntityListener temp = (ObjEntityListener) listener;
switch (e.getId()) {
case MapEvent.ADD:
temp.objEntityAdded(e);
@@ -943,9 +938,8 @@
removeFromHistory(e);
}
- EventListener[] list = listenerList.getListeners(DbEntityListener.class);
- for (int i = 0; i < list.length; i++) {
- DbEntityListener temp = (DbEntityListener) list[i];
+ for (EventListener listener : listenerList.getListeners(DbEntityListener.class)) {
+ DbEntityListener temp = (DbEntityListener) listener;
switch (e.getId()) {
case MapEvent.ADD:
temp.dbEntityAdded(e);
@@ -975,9 +969,8 @@
removeFromHistory(e);
}
- EventListener[] list = listenerList.getListeners(QueryListener.class);
- for (int i = 0; i < list.length; i++) {
- QueryListener listener = (QueryListener) list[i];
+ for (EventListener eventListener : listenerList.getListeners(QueryListener.class)) {
+ QueryListener listener = (QueryListener) eventListener;
switch (e.getId()) {
case MapEvent.ADD:
listener.queryAdded(e);
@@ -1007,9 +1000,8 @@
removeFromHistory(e);
}
- EventListener[] list = listenerList.getListeners(ProcedureListener.class);
- for (int i = 0; i < list.length; i++) {
- ProcedureListener listener = (ProcedureListener) list[i];
+ for (EventListener eventListener : listenerList.getListeners(ProcedureListener.class)) {
+ ProcedureListener listener = (ProcedureListener) eventListener;
switch (e.getId()) {
case MapEvent.ADD:
listener.procedureAdded(e);
@@ -1034,10 +1026,9 @@
public void fireProcedureParameterEvent(ProcedureParameterEvent e) {
setDirty(true);
- EventListener[] list = listenerList
- .getListeners(ProcedureParameterListener.class);
- for (int i = 0; i < list.length; i++) {
- ProcedureParameterListener listener = (ProcedureParameterListener) list[i];
+ EventListener[] list = listenerList.getListeners(ProcedureParameterListener.class);
+ for (EventListener eventListener : list) {
+ ProcedureParameterListener listener = (ProcedureParameterListener) eventListener;
switch (e.getId()) {
case MapEvent.ADD:
listener.procedureParameterAdded(e);
@@ -1200,9 +1191,8 @@
saveState(e);
}
- EventListener[] list = listenerList.getListeners(ObjEntityDisplayListener.class);
- for (int i = 0; i < list.length; i++) {
- ObjEntityDisplayListener temp = (ObjEntityDisplayListener) list[i];
+ for (EventListener listener : listenerList.getListeners(ObjEntityDisplayListener.class)) {
+ ObjEntityDisplayListener temp = (ObjEntityDisplayListener) listener;
temp.currentObjEntityChanged(e);
}
}
@@ -1225,9 +1215,8 @@
saveState(e);
}
- EventListener[] list = listenerList.getListeners(QueryDisplayListener.class);
- for (int i = 0; i < list.length; i++) {
- QueryDisplayListener listener = (QueryDisplayListener) list[i];
+ for (EventListener eventListener : listenerList.getListeners(QueryDisplayListener.class)) {
+ QueryDisplayListener listener = (QueryDisplayListener) eventListener;
listener.currentQueryChanged(e);
}
}
@@ -1250,9 +1239,8 @@
saveState(e);
}
- EventListener[] list = listenerList.getListeners(ProcedureDisplayListener.class);
- for (int i = 0; i < list.length; i++) {
- ProcedureDisplayListener listener = (ProcedureDisplayListener) list[i];
+ for (EventListener eventListener : listenerList.getListeners(ProcedureDisplayListener.class)) {
+ ProcedureDisplayListener listener = (ProcedureDisplayListener) eventListener;
listener.currentProcedureChanged(e);
}
}
@@ -1270,10 +1258,9 @@
currentState.procedureParameters = e.getProcedureParameters();
}
- EventListener[] list = listenerList
- .getListeners(ProcedureParameterDisplayListener.class);
- for (int i = 0; i < list.length; i++) {
- ProcedureParameterDisplayListener listener = (ProcedureParameterDisplayListener) list[i];
+ EventListener[] list = listenerList.getListeners(ProcedureParameterDisplayListener.class);
+ for (EventListener eventListener : list) {
+ ProcedureParameterDisplayListener listener = (ProcedureParameterDisplayListener) eventListener;
listener.currentProcedureParameterChanged(e);
}
}
@@ -1296,9 +1283,8 @@
saveState(e);
}
- EventListener[] list = listenerList.getListeners(DbEntityDisplayListener.class);
- for (int i = 0; i < list.length; i++) {
- DbEntityDisplayListener temp = (DbEntityDisplayListener) list[i];
+ for (EventListener listener : listenerList.getListeners(DbEntityDisplayListener.class)) {
+ DbEntityDisplayListener temp = (DbEntityDisplayListener) listener;
temp.currentDbEntityChanged(e);
}
}
@@ -1307,9 +1293,8 @@
public void fireDbAttributeEvent(AttributeEvent e) {
setDirty(true);
- EventListener[] list = listenerList.getListeners(DbAttributeListener.class);
- for (int i = 0; i < list.length; i++) {
- DbAttributeListener temp = (DbAttributeListener) list[i];
+ for (EventListener listener : listenerList.getListeners(DbAttributeListener.class)) {
+ DbAttributeListener temp = (DbAttributeListener) listener;
switch (e.getId()) {
case MapEvent.ADD:
temp.dbAttributeAdded(e);
@@ -1342,10 +1327,8 @@
currentState.dbAttrs.length);
}
- EventListener[] list = listenerList
- .getListeners(DbAttributeDisplayListener.class);
- for (int i = 0; i < list.length; i++) {
- DbAttributeDisplayListener temp = (DbAttributeDisplayListener) list[i];
+ for (EventListener listener : listenerList.getListeners(DbAttributeDisplayListener.class)) {
+ DbAttributeDisplayListener temp = (DbAttributeDisplayListener) listener;
temp.currentDbAttributeChanged(e);
}
}
@@ -1354,9 +1337,8 @@
public void fireObjAttributeEvent(AttributeEvent e) {
setDirty(true);
- EventListener[] list = listenerList.getListeners(ObjAttributeListener.class);
- for (int i = 0; i < list.length; i++) {
- ObjAttributeListener temp = (ObjAttributeListener) list[i];
+ for (EventListener listener : listenerList.getListeners(ObjAttributeListener.class)) {
+ ObjAttributeListener temp = (ObjAttributeListener) listener;
switch (e.getId()) {
case MapEvent.ADD:
temp.objAttributeAdded(e);
@@ -1389,10 +1371,9 @@
currentState.objAttrs.length);
}
- EventListener[] list = listenerList
- .getListeners(ObjAttributeDisplayListener.class);
- for (int i = 0; i < list.length; i++) {
- ObjAttributeDisplayListener temp = (ObjAttributeDisplayListener) list[i];
+ EventListener[] list = listenerList.getListeners(ObjAttributeDisplayListener.class);
+ for (EventListener listener : list) {
+ ObjAttributeDisplayListener temp = (ObjAttributeDisplayListener) listener;
temp.currentObjAttributeChanged(e);
}
}
@@ -1405,9 +1386,8 @@
((DbEntity) e.getEntity()).dbRelationshipChanged(e);
}
- EventListener[] list = listenerList.getListeners(DbRelationshipListener.class);
- for (int i = 0; i < list.length; i++) {
- DbRelationshipListener temp = (DbRelationshipListener) list[i];
+ for (EventListener listener : listenerList.getListeners(DbRelationshipListener.class)) {
+ DbRelationshipListener temp = (DbRelationshipListener) listener;
switch (e.getId()) {
case MapEvent.ADD:
temp.dbRelationshipAdded(e);
@@ -1440,10 +1420,8 @@
currentState.dbRels.length);
}
- EventListener[] list = listenerList
- .getListeners(DbRelationshipDisplayListener.class);
- for (int i = 0; i < list.length; i++) {
- DbRelationshipDisplayListener temp = (DbRelationshipDisplayListener) list[i];
+ for (EventListener listener : listenerList.getListeners(DbRelationshipDisplayListener.class)) {
+ DbRelationshipDisplayListener temp = (DbRelationshipDisplayListener) listener;
temp.currentDbRelationshipChanged(e);
}
}
@@ -1452,9 +1430,8 @@
public void fireObjRelationshipEvent(RelationshipEvent e) {
setDirty(true);
- EventListener[] list = listenerList.getListeners(ObjRelationshipListener.class);
- for (int i = 0; i < list.length; i++) {
- ObjRelationshipListener temp = (ObjRelationshipListener) list[i];
+ for (EventListener listener : listenerList.getListeners(ObjRelationshipListener.class)) {
+ ObjRelationshipListener temp = (ObjRelationshipListener) listener;
switch (e.getId()) {
case MapEvent.ADD:
temp.objRelationshipAdded(e);
@@ -1477,8 +1454,8 @@
currentState.paths = e.getPaths();
EventListener[] list = listenerList.getListeners(MultipleObjectsDisplayListener.class);
- for (int i = 0; i < list.length; i++) {
- MultipleObjectsDisplayListener temp = (MultipleObjectsDisplayListener) list[i];
+ for (EventListener listener : list) {
+ MultipleObjectsDisplayListener temp = (MultipleObjectsDisplayListener) listener;
temp.currentObjectsChanged(e);
}
}
@@ -1499,10 +1476,9 @@
currentState.objRels.length);
}
- EventListener[] list = listenerList
- .getListeners(ObjRelationshipDisplayListener.class);
- for (int i = 0; i < list.length; i++) {
- ObjRelationshipDisplayListener temp = (ObjRelationshipDisplayListener) list[i];
+ EventListener[] list = listenerList.getListeners(ObjRelationshipDisplayListener.class);
+ for (EventListener listener : list) {
+ ObjRelationshipDisplayListener temp = (ObjRelationshipDisplayListener) listener;
temp.currentObjRelationshipChanged(e);
}
}
@@ -1604,9 +1580,8 @@
public void fireCallbackMethodEvent(CallbackMethodEvent e) {
setDirty(true);
- EventListener[] list = listenerList.getListeners(CallbackMethodListener.class);
- for (int i = 0; i < list.length; i++) {
- CallbackMethodListener temp = (CallbackMethodListener) list[i];
+ for (EventListener listener : listenerList.getListeners(CallbackMethodListener.class)) {
+ CallbackMethodListener temp = (CallbackMethodListener) listener;
switch (e.getId()) {
case MapEvent.ADD:
temp.callbackMethodAdded(e);
@@ -1641,9 +1616,8 @@
public void fireEntityListenerEvent(EntityListenerEvent e) {
setDirty(true);
- EventListener[] list = listenerList.getListeners(EntityListenerListener.class);
- for (int i = 0; i < list.length; i++) {
- EntityListenerListener temp = (EntityListenerListener) list[i];
+ for (EventListener listener : listenerList.getListeners(EntityListenerListener.class)) {
+ EntityListenerListener temp = (EntityListenerListener) listener;
switch (e.getId()) {
case MapEvent.ADD:
temp.entityListenerAdded(e);
@@ -1699,9 +1673,9 @@
List<Object> result = new Vector<Object>();
Object parent = paths[0].getObjectParent();
-
- for (int i = 0; i < paths.length; i++) {
- Object lastObject = paths[i].getObject();
+
+ for (ProjectPath path : paths) {
+ Object lastObject = path.getObject();
result.add(lastObject);
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeModel.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeModel.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeModel.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeModel.java Sun Dec 28 13:41:54 2008
@@ -218,8 +218,8 @@
public ProjectPath registerNodes(TreeNode[] nodes) {
ProjectPath path = new ProjectPath();
- for (int i = 0; i < nodes.length; i++) {
- DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) nodes[i];
+ for (TreeNode node : nodes) {
+ DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) node;
path = path.appendToPath(treeNode.getUserObject());
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/AbstractRemoveCallbackMethodAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/AbstractRemoveCallbackMethodAction.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/AbstractRemoveCallbackMethodAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/AbstractRemoveCallbackMethodAction.java Sun Dec 28 13:41:54 2008
@@ -83,16 +83,16 @@
private void removeCallbackMethods(ActionEvent actionEvent) {
ProjectController mediator = getProjectController();
CallbackType callbackType = mediator.getCurrentCallbackType();
-
+
String[] callbackMethods = mediator.getCurrentCallbackMethods();
-
- for (int i = 0; i < callbackMethods.length; i++) {
- getCallbackMap().getCallbackDescriptor(callbackType.getType()).removeCallbackMethod(callbackMethods[i]);
+
+ for (String callbackMethod : callbackMethods) {
+ getCallbackMap().getCallbackDescriptor(callbackType.getType()).removeCallbackMethod(callbackMethod);
CallbackMethodEvent e = new CallbackMethodEvent(
- actionEvent.getSource(),
- null,
- callbackMethods[i],
- MapEvent.REMOVE);
+ actionEvent.getSource(),
+ null,
+ callbackMethod,
+ MapEvent.REMOVE);
mediator.fireCallbackMethodEvent(e);
}
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java Sun Dec 28 13:41:54 2008
@@ -151,8 +151,8 @@
else if (mediator.getCurrentPaths() != null) { //multiple deletion
if (dialog.shouldDelete("selected objects")) {
ProjectPath[] paths = mediator.getCurrentPaths();
- for (int i = 0; i < paths.length; i++) {
- removeLastPathComponent(paths[i]);
+ for (ProjectPath path : paths) {
+ removeLastPathComponent(path);
}
}
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAttributeAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAttributeAction.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAttributeAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAttributeAction.java Sun Dec 28 13:41:54 2008
@@ -99,13 +99,13 @@
ProjectController mediator = getProjectController();
DbEntity entity = mediator.getCurrentDbEntity();
DbAttribute[] attribs = mediator.getCurrentDbAttributes();
-
- for (int i = 0; i < attribs.length; i++) {
- entity.removeAttribute(attribs[i].getName());
+
+ for (DbAttribute attrib : attribs) {
+ entity.removeAttribute(attrib.getName());
AttributeEvent e = new AttributeEvent(
Application.getFrame(),
- attribs[i],
+ attrib,
entity,
MapEvent.REMOVE);
mediator.fireDbAttributeEvent(e);
@@ -119,12 +119,12 @@
ObjEntity entity = mediator.getCurrentObjEntity();
ObjAttribute[] attribs = mediator.getCurrentObjAttributes();
-
- for (int i = 0; i < attribs.length; i++) {
- entity.removeAttribute(attribs[i].getName());
+
+ for (ObjAttribute attrib : attribs) {
+ entity.removeAttribute(attrib.getName());
AttributeEvent e = new AttributeEvent(
Application.getFrame(),
- attribs[i],
+ attrib,
entity,
MapEvent.REMOVE);
mediator.fireObjAttributeEvent(e);
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveProcedureParameterAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveProcedureParameterAction.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveProcedureParameterAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveProcedureParameterAction.java Sun Dec 28 13:41:54 2008
@@ -84,14 +84,14 @@
protected void removeProcedureParameters() {
ProjectController mediator = getProjectController();
ProcedureParameter[] parameters = mediator.getCurrentProcedureParameters();
-
- for (int i = 0; i < parameters.length; i++) {
- mediator.getCurrentProcedure().removeCallParameter(parameters[i].getName());
+
+ for (ProcedureParameter parameter : parameters) {
+ mediator.getCurrentProcedure().removeCallParameter(parameter.getName());
ProcedureParameterEvent e = new ProcedureParameterEvent(
- Application.getFrame(),
- parameters[i],
- MapEvent.REMOVE);
+ Application.getFrame(),
+ parameter,
+ MapEvent.REMOVE);
mediator.fireProcedureParameterEvent(e);
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveRelationshipAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveRelationshipAction.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveRelationshipAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveRelationshipAction.java Sun Dec 28 13:41:54 2008
@@ -99,14 +99,14 @@
ProjectController mediator = getProjectController();
ObjEntity entity = mediator.getCurrentObjEntity();
ObjRelationship[] rels = mediator.getCurrentObjRelationships();
-
- for (int i = 0; i < rels.length; i++) {
- entity.removeRelationship(rels[i].getName());
+
+ for (ObjRelationship rel : rels) {
+ entity.removeRelationship(rel.getName());
RelationshipEvent e = new RelationshipEvent(
- Application.getFrame(),
- rels[i],
- entity,
- MapEvent.REMOVE);
+ Application.getFrame(),
+ rel,
+ entity,
+ MapEvent.REMOVE);
mediator.fireObjRelationshipEvent(e);
}
}
@@ -115,15 +115,15 @@
ProjectController mediator = getProjectController();
DbEntity entity = mediator.getCurrentDbEntity();
DbRelationship[] rels = mediator.getCurrentDbRelationships();
-
- for (int i = 0; i < rels.length; i++) {
- entity.removeRelationship(rels[i].getName());
+
+ for (DbRelationship rel : rels) {
+ entity.removeRelationship(rel.getName());
RelationshipEvent e = new RelationshipEvent(
- Application.getFrame(),
- rels[i],
- entity,
- MapEvent.REMOVE);
+ Application.getFrame(),
+ rel,
+ entity,
+ MapEvent.REMOVE);
mediator.fireDbRelationshipEvent(e);
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DBGeneratorOptions.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DBGeneratorOptions.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DBGeneratorOptions.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DBGeneratorOptions.java Sun Dec 28 13:41:54 2008
@@ -174,8 +174,8 @@
protected void refreshView() {
- for (int i = 0; i < optionBindings.length; i++) {
- optionBindings[i].updateView();
+ for (ObjectBinding optionBinding : optionBindings) {
+ optionBinding.updateView();
}
sqlBinding.updateView();
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java Sun Dec 28 13:41:54 2008
@@ -372,8 +372,8 @@
/**
* Update default rules for relationships
*/
- for (int i = 0; i < addedObjEntities.size(); i++) {
- DeleteRuleUpdater.updateObjEntity(addedObjEntities.get(i));
+ for (ObjEntity addedObjEntity : addedObjEntities) {
+ DeleteRuleUpdater.updateObjEntity(addedObjEntity);
}
}
catch (Throwable th) {
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java Sun Dec 28 13:41:54 2008
@@ -267,8 +267,7 @@
dataSource,
adapter);
boolean modelChanged = false;
- for (Iterator<MergerToken> it = tokensToMigrate.iterator(); it.hasNext();) {
- MergerToken tok = it.next();
+ for (MergerToken tok : tokensToMigrate) {
int numOfFailuresBefore = mergerContext
.getValidationResult()
.getFailures()
@@ -277,7 +276,7 @@
if (!modelChanged && tok.getDirection().equals(MergeDirection.TO_MODEL)) {
modelChanged = true;
}
-
+
if (numOfFailuresBefore == mergerContext
.getValidationResult()
.getFailures()
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DBConnectionInfoEditor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DBConnectionInfoEditor.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DBConnectionInfoEditor.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DBConnectionInfoEditor.java Sun Dec 28 13:41:54 2008
@@ -95,8 +95,8 @@
protected void refreshView() {
getView().setEnabled(connectionInfo != null);
- for (int i = 0; i < bindings.length; i++) {
- bindings[i].updateView();
+ for (ObjectBinding binding : bindings) {
+ binding.updateView();
}
}
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackListenersTab.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackListenersTab.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackListenersTab.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackListenersTab.java Sun Dec 28 13:41:54 2008
@@ -65,7 +65,7 @@
/**
* @return returns entity listeners list
*/
- protected abstract List getEntityListeners();
+ protected abstract List<EntityListener> getEntityListeners();
/**
* @return action for removing entity listeners
@@ -178,8 +178,7 @@
List entityListeners = getEntityListeners();
List listenerClasses = new ArrayList();
if (entityListeners != null) {
- for (Iterator i = getEntityListeners().iterator(); i.hasNext();) {
- EntityListener entityListener = (EntityListener)i.next();
+ for (EntityListener entityListener : getEntityListeners()) {
listenerClasses.add(entityListener.getClassName());
}
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackMethodsTab.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackMethodsTab.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackMethodsTab.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackMethodsTab.java Sun Dec 28 13:41:54 2008
@@ -304,10 +304,11 @@
List methods = new ArrayList();
CallbackDescriptor descriptor = null;
CallbackMap callbackMap = getCallbackMap();
+
if (callbackMap != null && callbackType != null) {
descriptor = callbackMap.getCallbackDescriptor(callbackType.getType());
- for (Iterator j = descriptor.getCallbackMethods().iterator(); j.hasNext();) {
- methods.add(j.next());
+ for (String callbackMethod : descriptor.getCallbackMethods()) {
+ methods.add(callbackMethod);
}
}
@@ -321,8 +322,7 @@
table.setRowHeight(25);
table.setRowMargin(3);
- TableColumn methodNameColumn = table.getColumnModel().getColumn(
- CallbackDescriptorTableModel.METHOD_NAME);
+ TableColumn methodNameColumn = table.getColumnModel().getColumn(CallbackDescriptorTableModel.METHOD_NAME);
methodNameColumn.setMinWidth(424);
mediator.setCurrentCallbackMethods(new String[0]);
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java Sun Dec 28 13:41:54 2008
@@ -228,8 +228,8 @@
PanelBuilder builder = super.createPanelBuilder();
RowSpec[] extraRows = RowSpec.decodeSpecs("3dlu, p");
- for (int i = 0; i < extraRows.length; i++) {
- builder.appendRow(extraRows[i]);
+ for (RowSpec extraRow : extraRows) {
+ builder.appendRow(extraRow);
}
CellConstraints cc = new CellConstraints();
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java Sun Dec 28 13:41:54 2008
@@ -202,8 +202,8 @@
Container mainPanel = (Container) getComponent(0);
Component[] children = mainPanel.getComponents();
- for (int i = 0; i < children.length; i++) {
- children[i].setEnabled(flag);
+ for (Component child : children) {
+ child.setEnabled(flag);
}
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/StringTransferHandler.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/StringTransferHandler.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/StringTransferHandler.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/StringTransferHandler.java Sun Dec 28 13:41:54 2008
@@ -46,8 +46,8 @@
}
public boolean canImport(JComponent c, DataFlavor[] flavors) {
- for (int i = 0; i < flavors.length; i++) {
- if (DataFlavor.stringFlavor.equals(flavors[i])) {
+ for (DataFlavor flavor : flavors) {
+ if (DataFlavor.stringFlavor.equals(flavor)) {
return true;
}
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/DataSourceEditor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/DataSourceEditor.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/DataSourceEditor.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/DataSourceEditor.java Sun Dec 28 13:41:54 2008
@@ -52,8 +52,8 @@
if (!Util.nullSafeEquals(this.node, node)) {
this.node = node;
- for (int i = 0; i < fieldAdapters.length; i++) {
- fieldAdapters[i].updateView();
+ for (ObjectBinding fieldAdapter : fieldAdapters) {
+ fieldAdapter.updateView();
}
}
}
@@ -69,8 +69,8 @@
protected abstract void prepareBindings(BindingBuilder builder);
protected void refreshView() {
- for (int i = 0; i < fieldAdapters.length; i++) {
- fieldAdapters[i].updateView();
+ for (ObjectBinding fieldAdapter : fieldAdapters) {
+ fieldAdapter.updateView();
}
}
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java Sun Dec 28 13:41:54 2008
@@ -261,8 +261,8 @@
refreshLocalDataSources();
- for (int i = 0; i < bindings.length; i++) {
- bindings[i].updateView();
+ for (ObjectBinding binding : bindings) {
+ binding.updateView();
}
showDataSourceSubview(getFactoryName());
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/PasswordEncoderEditor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/PasswordEncoderEditor.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/PasswordEncoderEditor.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/PasswordEncoderEditor.java Sun Dec 28 13:41:54 2008
@@ -113,13 +113,10 @@
getView().setVisible(false);
return;
}
-
- for (int i = 0; i < bindings.length; i++) {
- bindings[i].updateView();
- }
-
-
+ for (ObjectBinding binding : bindings) {
+ binding.updateView();
+ }
}
public void validatePasswordEncoderAction()
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/PKDBGeneratorPanel.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/PKDBGeneratorPanel.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/PKDBGeneratorPanel.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/PKDBGeneratorPanel.java Sun Dec 28 13:41:54 2008
@@ -91,9 +91,8 @@
}
void updateView(final DbEntity entity) {
- ItemListener[] listeners = attributes.getItemListeners();
- for (int i = 0; i < listeners.length; i++) {
- attributes.removeItemListener(listeners[i]);
+ for (ItemListener listener : attributes.getItemListeners()) {
+ attributes.removeItemListener(listener);
}
Collection pkAttributes = entity.getPrimaryKeys();
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java Sun Dec 28 13:41:54 2008
@@ -141,8 +141,8 @@
* First check if we must do anything at all
*/
boolean selectionChanged = false;
- for (int i = 0; i < rows.length; i++) {
- if (!isRowSelected(rows[i])) {
+ for (int row : rows) {
+ if (!isRowSelected(row)) {
selectionChanged = true;
break;
}
@@ -152,8 +152,8 @@
for (int i = getMinSelectionIndex(); i < getMaxSelectionIndex(); i++) {
if (isSelectedIndex(i)) {
boolean inNewSelection = false;
- for (int j = 0; j < rows.length; j++) {
- if (rows[j] == i) {
+ for (int row : rows) {
+ if (row == i) {
inNewSelection = true;
break;
}
@@ -174,8 +174,8 @@
fireForbidden = true;
clearSelection();
- for (int i = 0; i < rows.length; i++) {
- addRowSelectionInterval(rows[i], rows[i]);
+ for (int row : rows) {
+ addRowSelectionInterval(row, row);
}
fireForbidden = false;
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTableModel.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTableModel.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTableModel.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTableModel.java Sun Dec 28 13:41:54 2008
@@ -216,9 +216,9 @@
BeanInfo info = Introspector.getBeanInfo(beanClass);
PropertyDescriptor[] descriptors = info.getPropertyDescriptors();
- for (int i = 0; i < descriptors.length; i++) {
- if (propertyName.equals(descriptors[i].getName())) {
- return descriptors[i].getReadMethod();
+ for (PropertyDescriptor descriptor : descriptors) {
+ if (propertyName.equals(descriptor.getName())) {
+ return descriptor.getReadMethod();
}
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/FileWatchdog.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/FileWatchdog.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/FileWatchdog.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/FileWatchdog.java Sun Dec 28 13:41:54 2008
@@ -189,13 +189,13 @@
}
}
- for (int i = 0; i < deleted.size(); i++) {
- doOnRemove(deleted.get(i));
+ for (FileInfo aDeleted : deleted) {
+ doOnRemove(aDeleted);
if (singleNotification)
return;
}
- for (int i = 0; i < changed.size(); i++) {
- doOnChange(changed.get(i));
+ for (FileInfo aChanged : changed) {
+ doOnChange(aChanged);
if (singleNotification)
return;
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/MapModel.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/MapModel.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/MapModel.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/MapModel.java Sun Dec 28 13:41:54 2008
@@ -49,8 +49,8 @@
*/
public void storeProperties(Map<String, String> map) {
String[] properties = supportedProperties();
- for (int i = 0; i < properties.length; i++) {
- map.put(properties[i], this.map.get(properties[i]));
+ for (String property : properties) {
+ map.put(property, this.map.get(property));
}
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerUtil.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerUtil.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerUtil.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerUtil.java Sun Dec 28 13:41:54 2008
@@ -166,9 +166,9 @@
* (attributes, rel etc.)
*/
public static void updateActions(int numSelected, String... actionNames) {
- for (int i = 0; i < actionNames.length; i++) {
- CayenneAction action = Application.getInstance().getAction(actionNames[i]);
-
+ for (String actionName : actionNames) {
+ CayenneAction action = Application.getInstance().getAction(actionName);
+
if (action instanceof MultipleObjectsAction) {
action.setEnabled(numSelected > 0);
action.setName(((MultipleObjectsAction) action).getActionName(numSelected > 1));
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PanelFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PanelFactory.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PanelFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PanelFactory.java Sun Dec 28 13:41:54 2008
@@ -52,8 +52,8 @@
panel.setBorder(BorderFactory.createEmptyBorder(3, 20, 3, 7));
panel.setLayout(new FlowLayout(FlowLayout.RIGHT));
- for (int i = 0; i < buttons.length; i++) {
- panel.add(buttons[i]);
+ for (JButton button : buttons) {
+ panel.add(button);
}
return panel;
@@ -154,10 +154,10 @@
JScrollPane scroll_pane = new JScrollPane(table);
temp_panel.add(scroll_pane, BorderLayout.CENTER);
- for (int i = 0; i < components.length; i++) {
+ for (JComponent component : components) {
JPanel temp = new JPanel(new BorderLayout());
temp.add(temp_panel, BorderLayout.CENTER);
- temp.add(components[i], BorderLayout.SOUTH);
+ temp.add(component, BorderLayout.SOUTH);
temp_panel = temp;
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/HSQLEmbeddedPreferenceService.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/HSQLEmbeddedPreferenceService.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/HSQLEmbeddedPreferenceService.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/HSQLEmbeddedPreferenceService.java Sun Dec 28 13:41:54 2008
@@ -192,15 +192,15 @@
Version currentVersion = new Version(versionName);
Version previousVersion = new Version("0");
File lastDir = null;
- for (int i = 0; i < prefs.length; i++) {
- File dir = new File(prefsDir, prefs[i]);
+ for (String pref : prefs) {
+ File dir = new File(prefsDir, pref);
if (dir.isDirectory() && new File(dir, baseName + ".properties").isFile()) {
// check that there are DB files
Version v;
try {
- v = new Version(prefs[i]);
+ v = new Version(pref);
}
catch (NumberFormatException nfex) {
// ignore... not a version dir...
@@ -230,14 +230,13 @@
File[] filesToMove = dbDirectory.listFiles(new HSQLDBFileFilter(masterBaseName));
if (filesToMove != null) {
- for (int i = 0; i < filesToMove.length; i++) {
- String ext = Util.extractFileExtension(filesToMove[i].getName());
+ for (File fileToMove : filesToMove) {
+ String ext = Util.extractFileExtension(fileToMove.getName());
File target = new File(dbDirectory, targetBaseName + "." + ext);
- if (filesToMove[i].exists()) {
- filesToMove[i].renameTo(target);
- }
- else {
+ if (fileToMove.exists()) {
+ fileToMove.renameTo(target);
+ } else {
target.delete();
}
}
@@ -257,14 +256,13 @@
File[] filesToCopy = sourceDirectory.listFiles(new HSQLDBFileFilter(
masterBaseName));
if (filesToCopy != null) {
- for (int i = 0; i < filesToCopy.length; i++) {
- String ext = Util.extractFileExtension(filesToCopy[i].getName());
+ for (File fileToCopy : filesToCopy) {
+ String ext = Util.extractFileExtension(fileToCopy.getName());
File target = new File(dbDirectory, targetBaseName + "." + ext);
- if (filesToCopy[i].exists()) {
- Util.copy(filesToCopy[i], target);
- }
- else {
+ if (fileToCopy.exists()) {
+ Util.copy(fileToCopy, target);
+ } else {
target.delete();
}
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/swing/BeanActionBinding.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/swing/BeanActionBinding.java?rev=729776&r1=729775&r2=729776&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/swing/BeanActionBinding.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/swing/BeanActionBinding.java Sun Dec 28 13:41:54 2008
@@ -48,17 +48,17 @@
EventSetDescriptor[] events = info.getEventSetDescriptors();
if (events != null && events.length > 0) {
- for (int i = 0; i < events.length; i++) {
+ for (EventSetDescriptor event : events) {
if (ActionListener.class
- .isAssignableFrom(events[i].getListenerType())) {
+ .isAssignableFrom(event.getListenerType())) {
- events[i].getAddListenerMethod().invoke(component, new Object[] {
- new ActionListener() {
+ event.getAddListenerMethod().invoke(component, new Object[]{
+ new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- fireAction();
+ public void actionPerformed(ActionEvent e) {
+ fireAction();
+ }
}
- }
});
foundActionEvents = true;