Author: aadamchik
Date: Sun Feb 28 12:54:54 2010
New Revision: 917171
URL: http://svn.apache.org/viewvc?rev=917171&view=rev
Log:
misc. code cleanup:
* making QueryFormatter non-public, as it will be refactored into a service
later, and exposing it is a bad idea
* fixing modeler upgrade messages
* EJBQLQueryValidatorTest - moving in the right place
Added:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/validator/EJBQLQueryValidatorTest.java
- copied, changed from r916661,
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/validation/EJBQlQueryValidatorTest.java
Removed:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/validation/EJBQlQueryValidatorTest.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/QueryFormatter.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/QueryFormatter.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/QueryFormatter.java?rev=917171&r1=917170&r2=917171&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/QueryFormatter.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/QueryFormatter.java
Sun Feb 28 12:54:54 2010
@@ -26,7 +26,7 @@
/**
* QueryFormatter is utility class for formatting queries.
*/
-public final class QueryFormatter {
+final class QueryFormatter {
private QueryFormatter() {
// no instances
@@ -50,7 +50,7 @@
KEY_WORDS.put(" case ", "CASE");
}
- public static String formatQuery(String sql) {
+ static String formatQuery(String sql) {
Map<Integer, String> scanResult = scanQuery(sql);
Iterator<Integer> iter = scanResult.keySet().iterator();
int nextKeyIdx = (iter.hasNext()) ? iter.next() : -1;
Copied:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/validator/EJBQLQueryValidatorTest.java
(from r916661,
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/validation/EJBQlQueryValidatorTest.java)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/validator/EJBQLQueryValidatorTest.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/validator/EJBQLQueryValidatorTest.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/validation/EJBQlQueryValidatorTest.java&r1=916661&r2=917171&rev=917171&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/validation/EJBQlQueryValidatorTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/validator/EJBQLQueryValidatorTest.java
Sun Feb 28 12:54:54 2010
@@ -16,15 +16,14 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.validation;
+package org.apache.cayenne.project.validator;
-import org.apache.cayenne.project.validator.EJBQLQueryValidator;
import
org.apache.cayenne.project.validator.EJBQLQueryValidator.PositionException;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.unit.CayenneCase;
-public class EJBQlQueryValidatorTest extends CayenneCase{
+public class EJBQLQueryValidatorTest extends CayenneCase{
public void testValidateEJBQL(){
String[] ejbqlError = new String[] {
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java?rev=917171&r1=917170&r2=917171&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java
(original)
+++
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java
Sun Feb 28 12:54:54 2010
@@ -152,22 +152,26 @@
}
else if (UpgradeType.INTERMEDIATE_UPGRADE_NEEDED ==
md.getUpgradeType()) {
JOptionPane
- .showMessageDialog(
- Application.getFrame(),
- "Can't upgrade project. Use the Modeller "+
md.getIntermediateUpgradeVersion() +
- " and do an intermediate upgrade before doing 3.1
upgrade.",
- "Can't Upgrade Project",
- JOptionPane.OK_OPTION);
+ .showMessageDialog(
+ Application.getFrame(),
+ "Can't upgrade project. Open the project in
the Modeler v."
+ + md.getIntermediateUpgradeVersion()
+ + " to do an intermediate upgrade
before doing upgrade to "
+ + md.getSupportedVersion(),
+ "Can't Upgrade Project",
+ JOptionPane.OK_OPTION);
closeProject(false);
}
else if (UpgradeType.UPGRADE_NEEDED == md.getUpgradeType()) {
if (processUpgrades(md)) {
// perform upgrade
- logObj.info("Will upgrade project "
- + url.getPath());
+ logObj.info("Will upgrade project " + url.getPath());
Resource upgraded = handler.performUpgrade();
if (upgraded != null) {
- Project project = openProjectResourse(upgraded,
config, controller);
+ Project project = openProjectResourse(
+ upgraded,
+ config,
+ controller);
getProjectController().getProjectWatcher().pauseWatching();
getProjectController().getProjectWatcher().reconfigure();
@@ -197,13 +201,18 @@
ErrorDebugDialog.guiWarning(ex, "Error loading project");
}
}
-
- private Project openProjectResourse(Resource resource, Configuration
config, CayenneModelerController controller) {
- Project project = getApplication().getInjector().getInstance(
- ProjectLoader.class).loadProject(resource);
-
+
+ private Project openProjectResourse(
+ Resource resource,
+ Configuration config,
+ CayenneModelerController controller) {
+ Project project = getApplication()
+ .getInjector()
+ .getInstance(ProjectLoader.class)
+ .loadProject(resource);
+
controller.projectOpenedAction(project, config);
-
+
return project;
}
