You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2013/08/26 20:09:56 UTC
svn commit: r1517628 - in
/cayenne/main/trunk/modeler/cayenne-modeler/src/main:
java/org/apache/cayenne/modeler/action/
java/org/apache/cayenne/modeler/dialog/datadomain/
java/org/apache/cayenne/modeler/editor/
resources/org/apache/cayenne/modeler/images/
Author: aadamchik
Date: Mon Aug 26 18:09:56 2013
New Revision: 1517628
URL: http://svn.apache.org/r1517628
Log:
CAY-1841 Filters for Left-hand project navigator (kind of like Eclipse panel filters) to show/hide everything/objentities/dbentities/queries
21/Aug/13 patch by Ilya Vasiuk
Removed:
cayenne/main/trunk/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-tree-expand.png
Modified:
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ExpandTreeAction.java
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datadomain/FilterController.java
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datadomain/FilterDialog.java
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
cayenne/main/trunk/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-filter.png
cayenne/main/trunk/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-tree-collapse.png
Modified: cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java?rev=1517628&r1=1517627&r2=1517628&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java Mon Aug 26 18:09:56 2013
@@ -134,7 +134,6 @@ public class DefaultActionManager implem
registerAction(new ShowGraphEntityAction(application));
registerAction(new CollapseTreeAction(application));
- registerAction(new ExpandTreeAction(application));
registerAction(new FilterAction(application));
}
Modified: cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ExpandTreeAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ExpandTreeAction.java?rev=1517628&r1=1517627&r2=1517628&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ExpandTreeAction.java (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ExpandTreeAction.java Mon Aug 26 18:09:56 2013
@@ -1,47 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne.modeler.action;
-
-import java.awt.event.ActionEvent;
-
-import org.apache.cayenne.modeler.Application;
-
-import org.apache.cayenne.modeler.util.CayenneAction;
-
-public class ExpandTreeAction extends CayenneAction {
- private final static String EXPAND = "expand";
-
- public static String getActionName() {
- return "Expand tree";
- }
-
- @Override
- public String getIconName() {
- return "icon-tree-expand.png";
- }
-
- public ExpandTreeAction(Application application) {
- super(getActionName(), application);
- }
-
- @Override
- public void performAction(ActionEvent e) {
- getApplication().getFrameController().getEditorView().getFilterController().treeExpOrCollPath(EXPAND);
- }
-}
Modified: cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datadomain/FilterController.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datadomain/FilterController.java?rev=1517628&r1=1517627&r2=1517628&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datadomain/FilterController.java (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datadomain/FilterController.java Mon Aug 26 18:09:56 2013
@@ -85,7 +85,7 @@ public class FilterController {
tree.expandPath(parent);
}
else if(action == "collapse") {
- tree.collapsePath(parent);
+ treeModel.reload(treeModel.getRootNode());
}
}
Modified: cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datadomain/FilterDialog.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datadomain/FilterDialog.java?rev=1517628&r1=1517627&r2=1517628&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datadomain/FilterDialog.java (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datadomain/FilterDialog.java Mon Aug 26 18:09:56 2013
@@ -35,8 +35,7 @@ import org.apache.cayenne.swing.BindingB
public class FilterDialog extends JPopupMenu {
- private String SELECT_ALL = "Select all";
- private String UNSELECT_ALL = "Unselect all";
+ private String SHOW_ALL = "Show all";
private JCheckBoxMenuItem dbEntity;
private JCheckBoxMenuItem objEntity;
@@ -110,7 +109,7 @@ public class FilterDialog extends JPopup
public void initView(){
- all = new JCheckBoxMenuItem(UNSELECT_ALL);
+ all = new JCheckBoxMenuItem(SHOW_ALL);
dbEntity = new JCheckBoxMenuItem("DbEntity");
objEntity = new JCheckBoxMenuItem("ObjEntity");
embeddable = new JCheckBoxMenuItem("Embeddable");
@@ -154,39 +153,39 @@ public class FilterDialog extends JPopup
all.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- dbEntity.setState(all.getState());
- objEntity.setState(all.getState());
- embeddable.setState(all.getState());
- procedure.setState(all.getState());
- query.setState(all.getState());
- all.setText(all.getState() ? UNSELECT_ALL : SELECT_ALL);
+ dbEntity.setState(true);
+ objEntity.setState(true);
+ embeddable.setState(true);
+ procedure.setState(true);
+ query.setState(true);
+ all.setEnabled(false);
- filterController.getTreeModel().setFiltered(filterController.getFilterMap());
+ filterController.getTreeModel().setFiltered(filterController.getFilterMap());
filterController.treeExpOrCollPath("expand");
}
});
}
void checkAllStates() {
- if(isAll(true)) {
+ if(!isAll()) {
all.setState(false);
- all.setText(SELECT_ALL);
+ all.setEnabled(true);
}
- else if(isAll(false)) {
+ else {
all.setState(true);
- all.setText(UNSELECT_ALL);
+ all.setEnabled(false);
}
}
- private boolean isAll(boolean state) {
+ private boolean isAll() {
Set<String> keys=filterController.getFilterMap().keySet();
for(String key : keys) {
- if(filterController.getFilterMap().get(key) == state) {
+ if(filterController.getFilterMap().get(key) == false) {
return false;
}
}
-
+
return true;
}
Modified: cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java?rev=1517628&r1=1517627&r2=1517628&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java Mon Aug 26 18:09:56 2013
@@ -38,7 +38,6 @@ import org.apache.cayenne.modeler.Projec
import org.apache.cayenne.modeler.ProjectTreeView;
import org.apache.cayenne.modeler.action.ActionManager;
import org.apache.cayenne.modeler.action.CollapseTreeAction;
-import org.apache.cayenne.modeler.action.ExpandTreeAction;
import org.apache.cayenne.modeler.action.FilterAction;
import org.apache.cayenne.modeler.dialog.datadomain.FilterController;
import org.apache.cayenne.modeler.editor.datanode.DataNodeEditor;
@@ -181,14 +180,11 @@ public class EditorView extends JPanel i
treePanel = new ProjectTreeView(eventController);
JToolBar bar = new JToolBar();
- bar.setFloatable(false);
bar.setPreferredSize(new Dimension(100,30));
bar.add(Box.createHorizontalGlue());
- bar.add(getAction(ExpandTreeAction.class).buildButton());
bar.add(getAction(CollapseTreeAction.class).buildButton());
bar.add(getAction(FilterAction.class).buildButton());
- actionManager.getAction(ExpandTreeAction.class).setAlwaysOn(true);
actionManager.getAction(CollapseTreeAction.class).setAlwaysOn(true);
actionManager.getAction(FilterAction.class).setAlwaysOn(true);
Modified: cayenne/main/trunk/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-filter.png
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-filter.png?rev=1517628&r1=1517627&r2=1517628&view=diff
==============================================================================
Files cayenne/main/trunk/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-filter.png (original) and cayenne/main/trunk/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-filter.png Mon Aug 26 18:09:56 2013 differ
Modified: cayenne/main/trunk/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-tree-collapse.png
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-tree-collapse.png?rev=1517628&r1=1517627&r2=1517628&view=diff
==============================================================================
Files cayenne/main/trunk/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-tree-collapse.png (original) and cayenne/main/trunk/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-tree-collapse.png Mon Aug 26 18:09:56 2013 differ