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:47:32 UTC
svn commit: r729780 - in
/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne:
modeler/ modeler/action/ modeler/dialog/codegen/ modeler/dialog/db/
modeler/editor/ modeler/util/ pref/
Author: kmenard
Date: Sun Dec 28 13:47:31 2008
New Revision: 729780
URL: http://svn.apache.org/viewvc?rev=729780&view=rev
Log:
Removed redundant type casts.
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CodeTemplateManager.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ValidateAction.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/GeneratorController.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerTokenTableModel.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/util/MapModel.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceEditor.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceService.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Domain.java
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CodeTemplateManager.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CodeTemplateManager.java?rev=729780&r1=729779&r2=729780&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CodeTemplateManager.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CodeTemplateManager.java Sun Dec 28 13:47:31 2008
@@ -101,7 +101,7 @@
this.customTemplates = new HashMap<String, String>(templates.size(), 1);
for (Map.Entry<String, FSPath> entry : templates.entrySet()) {
- FSPath path = (FSPath) entry.getValue();
+ FSPath path = entry.getValue();
customTemplates.put(entry.getKey(), path.getPath());
}
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ValidateAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ValidateAction.java?rev=729780&r1=729779&r2=729780&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ValidateAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ValidateAction.java Sun Dec 28 13:47:31 2008
@@ -79,7 +79,7 @@
return false;
}
- Project project = (Project)path.firstInstanceOf(Project.class);
+ Project project = path.firstInstanceOf(Project.class);
return project != null;
}
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/GeneratorController.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/GeneratorController.java?rev=729780&r1=729779&r2=729780&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/GeneratorController.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/GeneratorController.java Sun Dec 28 13:47:31 2008
@@ -116,24 +116,19 @@
// no destination folder
if (outputDir == null) {
- JOptionPane.showMessageDialog(
- (Component) this.getView(),
- "Select directory for source files.");
+ JOptionPane.showMessageDialog(this.getView(), "Select directory for source files.");
return null;
}
// no such folder
if (!outputDir.exists() && !outputDir.mkdirs()) {
- JOptionPane.showMessageDialog(
- (Component) this.getView(),
- "Can't create directory " + outputDir + ". Select a different one.");
+ JOptionPane.showMessageDialog(this.getView(), "Can't create directory " + outputDir + ". Select a different one.");
return null;
}
// not a directory
if (!outputDir.isDirectory()) {
- JOptionPane.showMessageDialog((Component) this.getView(), outputDir
- + " is not a valid directory.");
+ JOptionPane.showMessageDialog(this.getView(), outputDir + " is not a valid directory.");
return null;
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerTokenTableModel.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerTokenTableModel.java?rev=729780&r1=729779&r2=729780&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerTokenTableModel.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerTokenTableModel.java Sun Dec 28 13:47:31 2008
@@ -84,7 +84,7 @@
}
public MergerToken getToken(int rowIndex) {
- return (MergerToken) tokens.get(rowIndex);
+ return tokens.get(rowIndex);
}
public Object getValueAt(int rowIndex, int columnIndex) {
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=729780&r1=729779&r2=729780&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:47:31 2008
@@ -185,7 +185,7 @@
SQLTemplate template = getQuery();
if (template != null) {
// in case of null entity, set root to DataMap
- Object root = entity != null ? (Object) entity : mediator.getCurrentDataMap();
+ Object root = entity != null ? entity : mediator.getCurrentDataMap();
template.setRoot(root);
mediator.fireQueryEvent(new QueryEvent(this, template));
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=729780&r1=729779&r2=729780&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:47:31 2008
@@ -73,7 +73,7 @@
}
public String getProperty(String key) {
- String value = (map != null) ? (String) map.get(key) : null;
+ String value = (map != null) ? map.get(key) : null;
return (value != null) ? value : defaultForKey(key);
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceEditor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceEditor.java?rev=729780&r1=729779&r2=729780&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceEditor.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceEditor.java Sun Dec 28 13:47:31 2008
@@ -63,8 +63,7 @@
public PreferenceDetail createDetail(Domain domain, String key) {
domain = editableInstance(domain);
- DomainPreference preference = (DomainPreference) getEditingContext().newObject(
- DomainPreference.class);
+ DomainPreference preference = getEditingContext().newObject(DomainPreference.class);
preference.setDomain(domain);
preference.setKey(key);
@@ -73,8 +72,7 @@
public PreferenceDetail createDetail(Domain domain, String key, Class javaClass) {
domain = editableInstance(domain);
- DomainPreference preferenceLink = (DomainPreference) getEditingContext()
- .newObject(DomainPreference.class);
+ DomainPreference preferenceLink = getEditingContext().newObject(DomainPreference.class);
preferenceLink.setDomain(domain);
preferenceLink.setKey(key);
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceService.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceService.java?rev=729780&r1=729779&r2=729780&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceService.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceService.java Sun Dec 28 13:47:31 2008
@@ -100,7 +100,7 @@
return null;
}
- Domain domain = (Domain) getDataContext().newObject(Domain.class);
+ Domain domain = getDataContext().newObject(Domain.class);
domain.setLevel(new Integer(0));
domain.setName(name);
savePreferences();
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Domain.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Domain.java?rev=729780&r1=729779&r2=729780&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Domain.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Domain.java Sun Dec 28 13:47:31 2008
@@ -221,8 +221,7 @@
return null;
}
- preferenceLink = (DomainPreference) getObjectContext().newObject(
- DomainPreference.class);
+ preferenceLink = getObjectContext().newObject(DomainPreference.class);
preferenceLink.setDomain(this);
preferenceLink.setKey(key);
getObjectContext().commitChanges();