You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/05/22 08:21:55 UTC

[1/3] cayenne git commit: Delete CayenneModeler name from the title in CayenneModeler

Repository: cayenne
Updated Branches:
  refs/heads/master 070df463e -> 4557c68c7


Delete CayenneModeler name from the title in CayenneModeler


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/9d2dc7d0
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/9d2dc7d0
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/9d2dc7d0

Branch: refs/heads/master
Commit: 9d2dc7d0a7cc945c6eeb3e5dc1c9b696d18e34bf
Parents: 09b0fdb
Author: Anton Dreka <dr...@gmail.com>
Authored: Mon May 15 16:21:33 2017 +0300
Committer: Anton Dreka <dr...@gmail.com>
Committed: Mon May 15 16:21:33 2017 +0300

----------------------------------------------------------------------
 .../cayenne/modeler/CayenneModelerController.java    | 15 +++++----------
 .../apache/cayenne/modeler/CayenneModelerFrame.java  |  1 -
 2 files changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/9d2dc7d0/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java
index ee6abf7..ef7f250 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java
@@ -166,18 +166,16 @@ public class CayenneModelerController extends CayenneController {
 
     public void projectModifiedAction() {
         String title = (projectController.getProject().getConfigurationResource() == null)
-                ? "[New]"
+                ? "[New Project]"
                 : projectController.getProject().getConfigurationResource().getURL().getPath();
-        frame.setTitle("* - " + ModelerConstants.TITLE + " - " + title);
+        frame.setTitle(title);
     }
 
     public void projectSavedAction() {
         projectController.setDirty(false);
         projectController.updateProjectControllerPreferences();
         updateStatus("Project saved...");
-        frame.setTitle(ModelerConstants.TITLE
-                + " - "
-                + projectController.getProject().getConfigurationResource().getURL().getPath());
+        frame.setTitle(projectController.getProject().getConfigurationResource().getURL().getPath());
     }
 
     /**
@@ -192,7 +190,6 @@ public class CayenneModelerController extends CayenneController {
         // repaint is needed, since sometimes there is a
         // trace from menu left on the screen
         frame.repaint();
-        frame.setTitle(ModelerConstants.TITLE);
 
         projectController.setProject(null);
 
@@ -219,12 +216,10 @@ public class CayenneModelerController extends CayenneController {
         // do status update AFTER the project is actually opened...
         if (project.getConfigurationResource() == null) {
             updateStatus("New project created...");
-            frame.setTitle(ModelerConstants.TITLE + "- [New]");
+            frame.setTitle("[New Project]");
         } else {
             updateStatus("Project opened...");
-            frame.setTitle(ModelerConstants.TITLE
-                    + " - "
-                    + project.getConfigurationResource().getURL().getPath());
+            frame.setTitle(project.getConfigurationResource().getURL().getPath());
         }
 
         // update preferences

http://git-wip-us.apache.org/repos/asf/cayenne/blob/9d2dc7d0/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
index daefadc..102f07b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
@@ -154,7 +154,6 @@ public class CayenneModelerFrame extends JFrame implements DataNodeDisplayListen
     protected WelcomeScreen welcomeScreen;
 
     public CayenneModelerFrame(ActionManager actionManager) {
-        super(ModelerConstants.TITLE);
         this.actionManager = actionManager;
 
         recentFileListeners = new Vector<>();


[3/3] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/213' into asf-master

Posted by nt...@apache.org.
Merge remote-tracking branch 'remotes/parent/pr/213' into asf-master


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4557c68c
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4557c68c
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4557c68c

Branch: refs/heads/master
Commit: 4557c68c708d7d6eae2e3f5d6181f5a55b9ccc9a
Parents: 070df46 26f17ef
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon May 22 11:14:32 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon May 22 11:14:32 2017 +0300

----------------------------------------------------------------------
 .../cayenne/modeler/CayenneModelerController.java   | 16 ++++++----------
 .../apache/cayenne/modeler/CayenneModelerFrame.java |  1 -
 2 files changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------



[2/3] cayenne git commit: Delete CayenneModeler name from the title in CayenneModeler

Posted by nt...@apache.org.
Delete CayenneModeler name from the title in CayenneModeler


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/26f17ef3
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/26f17ef3
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/26f17ef3

Branch: refs/heads/master
Commit: 26f17ef35b4f9469f603fadeb485919f73d68c57
Parents: 9d2dc7d
Author: Anton Dreka <dr...@gmail.com>
Authored: Mon May 22 09:54:21 2017 +0300
Committer: Anton Dreka <dr...@gmail.com>
Committed: Mon May 22 09:54:21 2017 +0300

----------------------------------------------------------------------
 .../java/org/apache/cayenne/modeler/CayenneModelerController.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/26f17ef3/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java
index ef7f250..98f0bd4 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java
@@ -168,7 +168,7 @@ public class CayenneModelerController extends CayenneController {
         String title = (projectController.getProject().getConfigurationResource() == null)
                 ? "[New Project]"
                 : projectController.getProject().getConfigurationResource().getURL().getPath();
-        frame.setTitle(title);
+        frame.setTitle("* - " + title);
     }
 
     public void projectSavedAction() {
@@ -190,6 +190,7 @@ public class CayenneModelerController extends CayenneController {
         // repaint is needed, since sometimes there is a
         // trace from menu left on the screen
         frame.repaint();
+        frame.setTitle("");
 
         projectController.setProject(null);