cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject cayenne git commit: CAY-2414 Modeler: new icon design
Date Wed, 21 Mar 2018 12:50:47 GMT
Repository: cayenne
Updated Branches:
  refs/heads/master 87d7e89b9 -> c55e46f0c


CAY-2414 Modeler: new icon design


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

Branch: refs/heads/master
Commit: c55e46f0c7cc95432e1eb6c1bdee8f749470b6e5
Parents: 87d7e89
Author: Nikita Timofeev <stariy95@gmail.com>
Authored: Wed Mar 21 15:05:01 2018 +0300
Committer: Nikita Timofeev <stariy95@gmail.com>
Committed: Wed Mar 21 15:05:01 2018 +0300

----------------------------------------------------------------------
 RELEASE-NOTES.txt                               |   1 +
 .../resources/assemblies/assembly-windows.xml   |   2 +-
 .../generic/GenericPlatformInitializer.java     |  28 ++++++++------
 .../apache/cayenne/modeler/osx/OSXPanelUI.java  |   7 +---
 .../modeler/osx/OSXPlatformInitializer.java     |  16 ++++++++
 .../cayenne/modeler/CayenneModelerFrame.java    |  15 +++-----
 .../modeler/action/CreateObjEntityAction.java   |   3 +-
 .../action/CreateObjEntityFromDbAction.java     |  37 +++++++++++++++++++
 .../modeler/action/DefaultActionManager.java    |  35 ++++++++++--------
 .../modeler/action/ImportEOModelAction.java     |   6 ++-
 .../modeler/editor/ObjEntityAttributePanel.java |   4 --
 .../editor/ObjEntityRelationshipPanel.java      |   1 -
 .../DbEntityAttributeRelationshipTab.java       |   4 +-
 .../modeler/editor/dbentity/DbEntityTab.java    |  31 ++++++----------
 .../cayenne/modeler/util/CayenneAction.java     |  21 -----------
 .../cayenne/modeler/util/CellRenderers.java     |  33 ++++++-----------
 .../cayenne/swing/ImageRendererColumn.java      |   3 --
 .../components/image/FilteredIconFactory.java   |  26 ++++++-------
 .../cayenne/swing/control/FileMenuItem.java     |   1 -
 .../cayenne/modeler/images/CayenneModeler.jpg   | Bin 23590 -> 0 bytes
 .../cayenne/modeler/images/CayenneModeler.png   | Bin 0 -> 5321 bytes
 .../cayenne/modeler/images/icon-attribute.png   | Bin 293 -> 304 bytes
 .../apache/cayenne/modeler/images/icon-copy.png | Bin 181 -> 203 bytes
 .../modeler/images/icon-create-method.png       | Bin 479 -> 483 bytes
 .../apache/cayenne/modeler/images/icon-cut.png  | Bin 391 -> 428 bytes
 .../cayenne/modeler/images/icon-datamap.png     | Bin 411 -> 529 bytes
 .../cayenne/modeler/images/icon-dbentity.png    | Bin 142 -> 257 bytes
 .../apache/cayenne/modeler/images/icon-dom.png  | Bin 421 -> 495 bytes
 .../apache/cayenne/modeler/images/icon-edit.png | Bin 340 -> 343 bytes
 .../cayenne/modeler/images/icon-embeddable.png  | Bin 440 -> 549 bytes
 .../cayenne/modeler/images/icon-eomodel.png     | Bin 0 -> 655 bytes
 .../cayenne/modeler/images/icon-error.png       | Bin 418 -> 423 bytes
 .../cayenne/modeler/images/icon-filter.png      | Bin 296 -> 263 bytes
 .../cayenne/modeler/images/icon-gen_java.png    | Bin 349 -> 335 bytes
 .../apache/cayenne/modeler/images/icon-info.png | Bin 702 -> 343 bytes
 .../cayenne/modeler/images/icon-inheritance.png | Bin 473 -> 626 bytes
 .../cayenne/modeler/images/icon-move_down.png   | Bin 304 -> 316 bytes
 .../cayenne/modeler/images/icon-move_up.png     | Bin 558 -> 621 bytes
 .../apache/cayenne/modeler/images/icon-new.png  | Bin 154 -> 169 bytes
 .../modeler/images/icon-new_embeddable.png      | Bin 521 -> 549 bytes
 .../modeler/images/icon-new_objentity.png       | Bin 563 -> 585 bytes
 .../cayenne/modeler/images/icon-new_query.png   | Bin 466 -> 447 bytes
 .../apache/cayenne/modeler/images/icon-node.png | Bin 350 -> 384 bytes
 .../cayenne/modeler/images/icon-objentity.png   | Bin 481 -> 573 bytes
 .../apache/cayenne/modeler/images/icon-open.png | Bin 317 -> 208 bytes
 .../cayenne/modeler/images/icon-paste.png       | Bin 244 -> 273 bytes
 .../apache/cayenne/modeler/images/icon-plus.png | Bin 129 -> 126 bytes
 .../cayenne/modeler/images/icon-query.png       | Bin 380 -> 447 bytes
 .../apache/cayenne/modeler/images/icon-redo.png | Bin 525 -> 435 bytes
 .../cayenne/modeler/images/icon-refresh.png     | Bin 506 -> 547 bytes
 .../modeler/images/icon-relationship.png        | Bin 347 -> 384 bytes
 .../modeler/images/icon-save-as-image.png       | Bin 217 -> 242 bytes
 .../apache/cayenne/modeler/images/icon-save.png | Bin 216 -> 224 bytes
 .../modeler/images/icon-stored-procedure.png    | Bin 389 -> 352 bytes
 .../apache/cayenne/modeler/images/icon-sync.png | Bin 280 -> 245 bytes
 .../cayenne/modeler/images/icon-trash.png       | Bin 164 -> 178 bytes
 .../modeler/images/icon-tree-collapse.png       | Bin 252 -> 223 bytes
 .../apache/cayenne/modeler/images/icon-undo.png | Bin 511 -> 429 bytes
 .../cayenne/modeler/images/icon-zoom-in.png     | Bin 409 -> 462 bytes
 .../cayenne/modeler/images/icon-zoom-out.png    | Bin 403 -> 466 bytes
 60 files changed, 142 insertions(+), 132 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 09b4d9c..5228c96 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -26,6 +26,7 @@ CAY-2404 Move itests to maven-plugins
 CAY-2406 Add prefetch-related API to SQLSelect
 CAY-2407 Modeler: add prefetch support for the SQLTemplate query
 CAY-2410 Add prefetch type support for SQLTemplate query and SelectQuery
+CAY-2414 Modeler: new icon design
 
 Bug Fixes:
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/assembly/src/main/resources/assemblies/assembly-windows.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-windows.xml b/assembly/src/main/resources/assemblies/assembly-windows.xml
index cacd57c..68d1315 100644
--- a/assembly/src/main/resources/assemblies/assembly-windows.xml
+++ b/assembly/src/main/resources/assemblies/assembly-windows.xml
@@ -54,7 +54,7 @@
 		</fileSet>
 		<fileSet>
 			<directory>../</directory>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>.</outputDirectory>
 			<includes>
 				<include>RELEASE-NOTES.txt</include>
 				<include>UPGRADE.txt</include>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java b/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
index 3dfc4af..d2dc486 100644
--- a/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
+++ b/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
@@ -64,18 +64,24 @@ public class GenericPlatformInitializer implements PlatformInitializer {
     }
 
     private void overrideUIDefaults() {
-        UIManager.put("ButtonUI",                  GenericButtonUI.class.getName());
-        UIManager.put("HiResGrayFilterEnabled",    Boolean.TRUE);
-        UIManager.put("Tree.expandedIcon",         ModelerUtil.buildIcon("icon-arrow-open.png"));
-        UIManager.put("Tree.collapsedIcon",        ModelerUtil.buildIcon("icon-arrow-closed.png"));
-        UIManager.put("Tree.paintLines",           Boolean.FALSE);
-        UIManager.put("Tree.selectionBorderColor", UIManager.get("Tree.selectionBackground"));
-        UIManager.put("ScrollPane.border",         BorderFactory.createEmptyBorder());
-        UIManager.put("Table.scrollPaneBorder",    BorderFactory.createEmptyBorder());
-        UIManager.put("SplitPane.border",          BorderFactory.createEmptyBorder());
-        UIManager.put("ToolBar.border",            BorderFactory.createEmptyBorder(1, 1, 1, 1));
+        Color greyHighlight = new Color(0xCBCBCB);
+
+        UIManager.put("ButtonUI",                       GenericButtonUI.class.getName());
+        UIManager.put("HiResGrayFilterEnabled",         Boolean.TRUE);
+        UIManager.put("Tree.expandedIcon",              ModelerUtil.buildIcon("icon-arrow-open.png"));
+        UIManager.put("Tree.collapsedIcon",             ModelerUtil.buildIcon("icon-arrow-closed.png"));
+        UIManager.put("Tree.paintLines",                Boolean.FALSE);
+        UIManager.put("Tree.selectionForeground",       Color.BLACK);
+        UIManager.put("Tree.selectionBackground",       greyHighlight);
+        UIManager.put("Tree.selectionBorderColor",      UIManager.get("Tree.selectionBackground"));
+        UIManager.put("ScrollPane.border",              BorderFactory.createEmptyBorder());
+        UIManager.put("Table.scrollPaneBorder",         BorderFactory.createEmptyBorder());
+        UIManager.put("SplitPane.border",               BorderFactory.createEmptyBorder());
+        UIManager.put("ToolBar.border",                 BorderFactory.createEmptyBorder(1, 1, 1, 1));
+        UIManager.put("MenuItem.selectionBackground",   greyHighlight);
+        UIManager.put("MenuItem.selectionForeground",   Color.BLACK);
         // this one is custom for MainToolBar
-        UIManager.put("MainToolBar.border",        BorderFactory.createLineBorder(Color.GRAY));
+        UIManager.put("MainToolBar.border",             BorderFactory.createLineBorder(Color.GRAY));
     }
 
     protected PlasticTheme findTheme() {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPanelUI.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPanelUI.java b/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPanelUI.java
index fa45832..88dad62 100644
--- a/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPanelUI.java
+++ b/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPanelUI.java
@@ -66,12 +66,7 @@ public class OSXPanelUI extends BasicPanelUI {
     protected void installDefaults(final JPanel p) {
         super.installDefaults(p);
         if(p instanceof CayenneModelerFrame.SearchPanel) {
-            SwingUtilities.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    ((CayenneModelerFrame.SearchPanel)p).hideSearchLabel();
-                }
-            });
+            SwingUtilities.invokeLater(((CayenneModelerFrame.SearchPanel) p)::hideSearchLabel);
         } else {
             p.setBackground(BACKGROUND);
         }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java b/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java
index 21c8805..159f09c 100644
--- a/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java
+++ b/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java
@@ -20,6 +20,7 @@ package org.apache.cayenne.modeler.osx;
 
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Graphics;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -31,6 +32,7 @@ import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 import javax.swing.UIManager;
+import javax.swing.border.AbstractBorder;
 import javax.swing.border.Border;
 
 import org.apache.cayenne.di.Inject;
@@ -86,6 +88,20 @@ public class OSXPlatformInitializer implements PlatformInitializer {
         UIManager.put("SplitPane.border",            BorderFactory.createEmptyBorder());
         UIManager.put("SplitPane.background",        darkGrey);
         UIManager.put("Tree.rendererFillBackground", Boolean.TRUE);
+        UIManager.put("Tree.selectionForeground",    Color.BLACK);
+        UIManager.put("Tree.selectionBackground",    lightGrey);
+        UIManager.put("Tree.selectionBorderColor",   lightGrey);
+
+        Border backgroundPainter = new AbstractBorder() {
+            @Override
+            public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
+                g.setColor(lightGrey);
+                g.fillRect(0, 0, width - 1, height - 1);
+            }
+        };
+        UIManager.put("MenuItem.selectedBackgroundPainter", backgroundPainter);
+        UIManager.put("MenuItem.selectionForeground",       Color.BLACK);
+
     }
 
     public void setupMenus(JFrame frame) {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/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 955b3a4..52cfcd3 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
@@ -27,7 +27,6 @@ import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Font;
 import java.awt.Toolkit;
-import java.awt.event.AWTEventListener;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
 import java.awt.event.KeyEvent;
@@ -159,7 +158,7 @@ public class CayenneModelerFrame extends JFrame implements DataNodeDisplayListen
 
         recentFileListeners = new Vector<>();
 
-        setIconImage(ModelerUtil.buildIcon("CayenneModeler.jpg").getImage());
+        setIconImage(ModelerUtil.buildIcon("CayenneModeler.png").getImage());
         initMenus();
         initToolbar();
         initStatusBar();
@@ -560,13 +559,11 @@ public class CayenneModelerFrame extends JFrame implements DataNodeDisplayListen
             });
             findField.setAction(getAction(FindAction.class));
 
-            Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener() {
-                public void eventDispatched(AWTEvent event) {
-                    if (event instanceof KeyEvent) {
-                        if (((KeyEvent) event).getModifiers() == Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()
-                                && ((KeyEvent) event).getKeyCode() == KeyEvent.VK_F) {
-                            findField.requestFocus();
-                        }
+            Toolkit.getDefaultToolkit().addAWTEventListener(event -> {
+                if (event instanceof KeyEvent) {
+                    if (((KeyEvent) event).getModifiers() == Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()
+                            && ((KeyEvent) event).getKeyCode() == KeyEvent.VK_F) {
+                        findField.requestFocus();
                     }
                 }
             }, AWTEvent.KEY_EVENT_MASK);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityAction.java
index 9080833..1d12407 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityAction.java
@@ -52,7 +52,6 @@ public class CreateObjEntityAction extends CayenneAction {
         return "Create ObjEntity";
     }
 
-
     static void fireObjEntityEvent(
             Object src,
             ProjectController mediator,
@@ -71,7 +70,7 @@ public class CreateObjEntityAction extends CayenneAction {
 
     @Override
     public String getIconName() {
-        return "icon-new_objentity.png";
+        return "icon-objentity.png";
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityFromDbAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityFromDbAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityFromDbAction.java
new file mode 100644
index 0000000..a4d29fb
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityFromDbAction.java
@@ -0,0 +1,37 @@
+/*****************************************************************
+ *   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 org.apache.cayenne.modeler.Application;
+
+/**
+ * @since 4.1
+ */
+public class CreateObjEntityFromDbAction extends CreateObjEntityAction {
+
+    public CreateObjEntityFromDbAction(Application application) {
+        super(application);
+    }
+
+    @Override
+    public String getIconName() {
+        return "icon-new_objentity.png";
+    }
+}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
index 1b74901..fa427f8 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
@@ -73,6 +73,7 @@ public class DefaultActionManager implements ActionManager {
         registerAction(new CreateDataMapAction(application));
         registerAction(new GenerateCodeAction(application));
         registerAction(new CreateObjEntityAction(application));
+        registerAction(new CreateObjEntityFromDbAction(application));
         registerAction(new CreateDbEntityAction(application));
         registerAction(new CreateProcedureAction(application));
         registerAction(new CreateProcedureParameterAction(application));
@@ -141,14 +142,14 @@ public class DefaultActionManager implements ActionManager {
     }
 
     private void initActions() {
-        SPECIAL_ACTIONS = new HashSet<String>();
+        SPECIAL_ACTIONS = new HashSet<>();
 
         SPECIAL_ACTIONS.addAll(Arrays.asList(
                 SaveAction.class.getName(),
                 UndoAction.class.getName(),
                 RedoAction.class.getName()));
 
-        PROJECT_ACTIONS = new HashSet<String>();
+        PROJECT_ACTIONS = new HashSet<>();
         PROJECT_ACTIONS.addAll(Arrays.asList(
                 RevertAction.class.getName(),
                 ProjectAction.class.getName(),
@@ -156,7 +157,7 @@ public class DefaultActionManager implements ActionManager {
                 SaveAsAction.class.getName(),
                 FindAction.class.getName()));
 
-        DOMAIN_ACTIONS = new HashSet<String>(PROJECT_ACTIONS);
+        DOMAIN_ACTIONS = new HashSet<>(PROJECT_ACTIONS);
         DOMAIN_ACTIONS.addAll(Arrays.asList(
                 ImportDataMapAction.class.getName(),
                 CreateDataMapAction.class.getName(),
@@ -167,12 +168,12 @@ public class DefaultActionManager implements ActionManager {
                 GenerateDBAction.class.getName(),
                 PasteAction.class.getName()));
 
-        DATA_NODE_ACTIONS = new HashSet<String>(DOMAIN_ACTIONS);
+        DATA_NODE_ACTIONS = new HashSet<>(DOMAIN_ACTIONS);
         DATA_NODE_ACTIONS.addAll(Arrays.asList(
                 LinkDataMapsAction.class.getName(),
                 RemoveAction.class.getName()));
 
-        DATA_MAP_ACTIONS = new HashSet<String>(DOMAIN_ACTIONS);
+        DATA_MAP_ACTIONS = new HashSet<>(DOMAIN_ACTIONS);
         DATA_MAP_ACTIONS.addAll(Arrays.asList(
                 CreateEmbeddableAction.class.getName(),
                 CreateObjEntityAction.class.getName(),
@@ -185,7 +186,7 @@ public class DefaultActionManager implements ActionManager {
                 CutAction.class.getName(),
                 CopyAction.class.getName()));
 
-        OBJ_ENTITY_ACTIONS = new HashSet<String>(DATA_MAP_ACTIONS);
+        OBJ_ENTITY_ACTIONS = new HashSet<>(DATA_MAP_ACTIONS);
 
         OBJ_ENTITY_ACTIONS.addAll(Arrays.asList(
                 ObjEntitySyncAction.class.getName(),
@@ -195,25 +196,26 @@ public class DefaultActionManager implements ActionManager {
                 ObjEntityToSuperEntityAction.class.getName(),
                 ShowGraphEntityAction.class.getName()));
 
-        DB_ENTITY_ACTIONS = new HashSet<String>(DATA_MAP_ACTIONS);
+        DB_ENTITY_ACTIONS = new HashSet<>(DATA_MAP_ACTIONS);
 
         DB_ENTITY_ACTIONS.addAll(Arrays.asList(
                 CreateAttributeAction.class.getName(),
                 CreateRelationshipAction.class.getName(),
                 DbEntitySyncAction.class.getName(),
                 DbEntityCounterpartAction.class.getName(),
-                ShowGraphEntityAction.class.getName()));
+                ShowGraphEntityAction.class.getName(),
+                CreateObjEntityFromDbAction.class.getName()));
 
-        EMBEDDABLE_ACTIONS = new HashSet<String>(DATA_MAP_ACTIONS);
+        EMBEDDABLE_ACTIONS = new HashSet<>(DATA_MAP_ACTIONS);
 
-        EMBEDDABLE_ACTIONS.addAll(Arrays.asList(CreateAttributeAction.class.getName()));
+        EMBEDDABLE_ACTIONS.addAll(Collections.singletonList(CreateAttributeAction.class.getName()));
 
-        PROCEDURE_ACTIONS = new HashSet<String>(DATA_MAP_ACTIONS);
+        PROCEDURE_ACTIONS = new HashSet<>(DATA_MAP_ACTIONS);
 
-        PROCEDURE_ACTIONS.addAll(Arrays.asList(CreateProcedureParameterAction.class
+        PROCEDURE_ACTIONS.addAll(Collections.singletonList(CreateProcedureParameterAction.class
                 .getName()));
 
-        MULTIPLE_OBJECTS_ACTIONS = new HashSet<String>(PROJECT_ACTIONS);
+        MULTIPLE_OBJECTS_ACTIONS = new HashSet<>(PROJECT_ACTIONS);
 
         MULTIPLE_OBJECTS_ACTIONS.addAll(Arrays.asList(
                 RemoveAction.class.getName(),
@@ -248,6 +250,7 @@ public class DefaultActionManager implements ActionManager {
         }
     }
 
+    @SuppressWarnings("unchecked")
     public <T extends Action> T getAction(Class<T> actionClass) {
         return (T) actionMap.get(actionClass.getName());
     }
@@ -261,7 +264,7 @@ public class DefaultActionManager implements ActionManager {
     }
 
     public void projectClosed() {
-        processActionsState(Collections.<String> emptySet());
+        processActionsState(Collections.emptySet());
         updateActions("");
     }
 
@@ -322,7 +325,7 @@ public class DefaultActionManager implements ActionManager {
         boolean canCopy = true; // cut/copy can be performed if selected objects are on
         // the same level
 
-        if (!cutAction.enableForPath((ConfigurationNode) objects[0])) {
+        if (!cutAction.enableForPath(objects[0])) {
             canCopy = false;
         }
         else {
@@ -333,7 +336,7 @@ public class DefaultActionManager implements ActionManager {
 
             for (int i = 1; i < objects.length; i++) {
                 if (parentGetter.getParent(objects[i]) != parent
-                        || !cutAction.enableForPath((ConfigurationNode) objects[i])) {
+                        || !cutAction.enableForPath(objects[i])) {
                     canCopy = false;
                     break;
                 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
index 9733f83..2e438e6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
@@ -77,6 +77,10 @@ public class ImportEOModelAction extends CayenneAction {
         super(getActionName(), application);
     }
 
+    public String getIconName() {
+        return "icon-eomodel.png";
+    }
+
     public void performAction(ActionEvent event) {
         importEOModel();
     }
@@ -286,7 +290,7 @@ public class ImportEOModelAction extends CayenneAction {
         }
         else {
             // fix DataMap name, as there maybe a map with the same name already
-            ConfigurationNode root = (DataChannelDescriptor) mediator.getProject().getRootNode();
+            ConfigurationNode root = mediator.getProject().getRootNode();
             map.setName(NameBuilder
                     .builder(map, root)
                     .baseName(map.getName())

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java
index 263a0c0..7cae33e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java
@@ -463,10 +463,6 @@ public class ObjEntityAttributePanel extends JPanel implements ObjEntityDisplayL
             } else {
                 if (attribute.isInherited()) {
                     Icon objEntityIcon = ModelerUtil.buildIcon("icon-inheritance.png");
-                    if(isSelected) {
-                        objEntityIcon = FilteredIconFactory
-                                .createIcon(objEntityIcon, FilteredIconFactory.FilterType.SELECTION);
-                    }
                     setIcon(objEntityIcon);
                 }
                 setText("");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java
index 01bab81..c7c3788 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java
@@ -388,7 +388,6 @@ public class ObjEntityRelationshipPanel extends JPanel implements ObjEntityDispl
 
             Icon icon = CellRenderers.iconForObject(oldValue);
             if(isSelected) {
-                icon = FilteredIconFactory.createIcon(icon, FilteredIconFactory.FilterType.SELECTION);
                 setForeground(UIManager.getColor("Table.selectionForeground"));
             }
             setIcon(icon);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributeRelationshipTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributeRelationshipTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributeRelationshipTab.java
index e417f88..792e19f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributeRelationshipTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributeRelationshipTab.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.modeler.ProjectController;
 import org.apache.cayenne.modeler.action.ActionManager;
 import org.apache.cayenne.modeler.action.CopyAttributeRelationshipAction;
 import org.apache.cayenne.modeler.action.CreateAttributeAction;
-import org.apache.cayenne.modeler.action.CreateObjEntityAction;
+import org.apache.cayenne.modeler.action.CreateObjEntityFromDbAction;
 import org.apache.cayenne.modeler.action.CreateRelationshipAction;
 import org.apache.cayenne.modeler.action.CutAttributeRelationshipAction;
 import org.apache.cayenne.modeler.action.DbEntityCounterpartAction;
@@ -107,7 +107,7 @@ public class DbEntityAttributeRelationshipTab extends JPanel implements DbEntity
         toolBar.add(actionManager.getAction(CreateRelationshipAction.class).buildButton(3));
         toolBar.addSeparator();
 
-        toolBar.add(actionManager.getAction(CreateObjEntityAction.class).buildButton(1));
+        toolBar.add(actionManager.getAction(CreateObjEntityFromDbAction.class).buildButton(1));
         toolBar.add(actionManager.getAction(DbEntitySyncAction.class).buildButton(2));
         toolBar.add(actionManager.getAction(DbEntityCounterpartAction.class).buildButton(3));
         toolBar.addSeparator();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java
index 0f49f46..40ec72f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java
@@ -21,8 +21,6 @@ package org.apache.cayenne.modeler.editor.dbentity;
 
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
 import java.util.EventObject;
 import javax.swing.BorderFactory;
 import javax.swing.DefaultComboBoxModel;
@@ -38,13 +36,12 @@ import org.apache.cayenne.configuration.DataChannelDescriptor;
 import org.apache.cayenne.exp.Expression;
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.map.ObjRelationship;
 import org.apache.cayenne.map.event.EntityEvent;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ProjectController;
 import org.apache.cayenne.modeler.action.ActionManager;
 import org.apache.cayenne.modeler.action.CreateAttributeAction;
-import org.apache.cayenne.modeler.action.CreateObjEntityAction;
+import org.apache.cayenne.modeler.action.CreateObjEntityFromDbAction;
 import org.apache.cayenne.modeler.action.CreateRelationshipAction;
 import org.apache.cayenne.modeler.action.DbEntityCounterpartAction;
 import org.apache.cayenne.modeler.action.DbEntitySyncAction;
@@ -106,7 +103,7 @@ public class DbEntityTab extends JPanel implements ExistingSelectionProcessor, D
         toolBar.add(actionManager.getAction(CreateRelationshipAction.class).buildButton(3));
         toolBar.addSeparator();
 
-        toolBar.add(actionManager.getAction(CreateObjEntityAction.class).buildButton(1));
+        toolBar.add(actionManager.getAction(CreateObjEntityFromDbAction.class).buildButton(1));
         toolBar.add(actionManager.getAction(DbEntitySyncAction.class).buildButton(2));
         toolBar.add(actionManager.getAction(DbEntityCounterpartAction.class).buildButton(3));
         toolBar.addSeparator();
@@ -186,19 +183,16 @@ public class DbEntityTab extends JPanel implements ExistingSelectionProcessor, D
     private void initController() {
         mediator.addDbEntityDisplayListener(this);
 
-        pkGeneratorType.addItemListener(new ItemListener() {
+        pkGeneratorType.addItemListener(e -> {
+            pkGeneratorDetailLayout.show(pkGeneratorDetail, (String) pkGeneratorType.getSelectedItem());
 
-            public void itemStateChanged(ItemEvent e) {
-                pkGeneratorDetailLayout.show(pkGeneratorDetail, (String) pkGeneratorType.getSelectedItem());
+            for (int i = 0; i < pkGeneratorDetail.getComponentCount(); i++) {
+                if (pkGeneratorDetail.getComponent(i).isVisible()) {
 
-                for (int i = 0; i < pkGeneratorDetail.getComponentCount(); i++) {
-                    if (pkGeneratorDetail.getComponent(i).isVisible()) {
-
-                        DbEntity entity = mediator.getCurrentDbEntity();
-                        PKGeneratorPanel panel = (PKGeneratorPanel) pkGeneratorDetail.getComponent(i);
-                        panel.onInit(entity);
-                        break;
-                    }
+                    DbEntity entity = mediator.getCurrentDbEntity();
+                    PKGeneratorPanel panel = (PKGeneratorPanel) pkGeneratorDetail.getComponent(i);
+                    panel.onInit(entity);
+                    break;
                 }
             }
         });
@@ -217,10 +211,7 @@ public class DbEntityTab extends JPanel implements ExistingSelectionProcessor, D
             return;
         }
 
-        // if entity hasn't changed, still notify PK Generator panels, as entity
-        // PK may
-        // have changed...
-
+        // if entity hasn't changed, still notify PK Generator panels, as entity PK may have changed...
         for (int i = 0; i < pkGeneratorDetail.getComponentCount(); i++) {
             ((PKGeneratorPanel) pkGeneratorDetail.getComponent(i)).setDbEntity(entity);
         }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java
index 213b5f6..a896466 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java
@@ -240,31 +240,10 @@ public abstract class CayenneAction extends AbstractAction {
 
         public CayenneMenuItem(String title, Icon icon) {
             super(title, icon);
-            updateActiveIcon();
         }
 
         public CayenneMenuItem(AbstractAction action) {
             super(action);
-            updateActiveIcon();
-        }
-
-        protected void updateActiveIcon() {
-            final Icon icon = getIcon();
-            final Icon selectedIcon = FilteredIconFactory.createIcon(icon, FilteredIconFactory.FilterType.WHITE);
-            // this wouldn't work on MacOS, as it uses native menu
-            addMouseListener(new MouseAdapter() {
-                @Override
-                public void mouseEntered(MouseEvent e) {
-                    if(isEnabled()) {
-                        setIcon(selectedIcon);
-                    }
-                }
-
-                @Override
-                public void mouseExited(MouseEvent e) {
-                    setIcon(icon);
-                }
-            });
         }
     }
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellRenderers.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellRenderers.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellRenderers.java
index 58cebac..8a9e562 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellRenderers.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellRenderers.java
@@ -60,23 +60,14 @@ import org.apache.cayenne.util.CayenneMapEntry;
 public final class CellRenderers {
 
     // common icons
-    protected static Icon domainIcon       = FilteredIconFactory.createIcon(
-            ModelerUtil.buildIcon("icon-dom.png"), FilteredIconFactory.FilterType.GRAY);
-    protected static Icon nodeIcon         = FilteredIconFactory.createIcon(
-            ModelerUtil.buildIcon("icon-node.png"), FilteredIconFactory.FilterType.GRAY);
-    protected static Icon mapIcon          = FilteredIconFactory.createIcon(
-            ModelerUtil.buildIcon("icon-datamap.png"), FilteredIconFactory.FilterType.GRAY);
-    protected static Icon dbEntityIcon     = FilteredIconFactory.createIcon(
-            ModelerUtil.buildIcon("icon-dbentity.png"), FilteredIconFactory.FilterType.BLUE);
-    protected static Icon objEntityIcon    = FilteredIconFactory.createIcon(
-            ModelerUtil.buildIcon("icon-objentity.png"), FilteredIconFactory.FilterType.GREEN);
-    protected static Icon procedureIcon    = FilteredIconFactory.createIcon(
-            ModelerUtil.buildIcon("icon-stored-procedure.png"), FilteredIconFactory.FilterType.GRAY);
-    protected static Icon queryIcon        = FilteredIconFactory.createIcon(
-            ModelerUtil.buildIcon("icon-query.png"), FilteredIconFactory.FilterType.GRAY);
-    protected static Icon embeddableIcon   = FilteredIconFactory.createIcon(
-            ModelerUtil.buildIcon("icon-embeddable.png"), FilteredIconFactory.FilterType.VIOLET);
-
+    protected static Icon domainIcon       = ModelerUtil.buildIcon("icon-dom.png");
+    protected static Icon nodeIcon         = ModelerUtil.buildIcon("icon-node.png");
+    protected static Icon mapIcon          = ModelerUtil.buildIcon("icon-datamap.png");
+    protected static Icon dbEntityIcon     = ModelerUtil.buildIcon("icon-dbentity.png");
+    protected static Icon objEntityIcon    = ModelerUtil.buildIcon("icon-objentity.png");
+    protected static Icon procedureIcon    = ModelerUtil.buildIcon("icon-stored-procedure.png");
+    protected static Icon queryIcon        = ModelerUtil.buildIcon("icon-query.png");
+    protected static Icon embeddableIcon   = ModelerUtil.buildIcon("icon-embeddable.png");
     protected static Icon relationshipIcon = ModelerUtil.buildIcon("icon-relationship.png");
     protected static Icon attributeIcon    = ModelerUtil.buildIcon("icon-attribute.png");
 
@@ -218,7 +209,7 @@ public final class CellRenderers {
                 isSelected,
                 cellHasFocus);
 
-            setIcon(isSelected ? FilteredIconFactory.createIcon(icon, FilteredIconFactory.FilterType.SELECTION) : icon);
+            setIcon(icon);//isSelected ? FilteredIconFactory.createIcon(icon, FilteredIconFactory.FilterType.SELECTION) : icon);
             setFont(defaultFont);
 
             return this;
@@ -261,7 +252,7 @@ public final class CellRenderers {
             if (showIcons) {
                 Icon icon = iconForObject(value);
                 if(isSelected) {
-                    icon = FilteredIconFactory.createIcon(icon, FilteredIconFactory.FilterType.SELECTION);
+//                    icon = FilteredIconFactory.createIcon(icon, FilteredIconFactory.FilterType.SELECTION);
                 }
                 setIcon(icon);
             }
@@ -296,7 +287,7 @@ public final class CellRenderers {
             DefaultMutableTreeNode node = (DefaultMutableTreeNode) value;
             Icon icon = iconForObject(node.getUserObject());
             if(sel) {
-                icon = FilteredIconFactory.createIcon(icon, FilteredIconFactory.FilterType.SELECTION);
+//                icon = FilteredIconFactory.createIcon(icon, FilteredIconFactory.FilterType.SELECTION);
             }
             setIcon(icon);
             setFont(defaultFont);
@@ -334,7 +325,7 @@ public final class CellRenderers {
 
             Icon icon = CellRenderers.iconForObject(oldValue);
             if(isSelected) {
-                icon = FilteredIconFactory.createIcon(icon, FilteredIconFactory.FilterType.SELECTION);
+//                icon = FilteredIconFactory.createIcon(icon, FilteredIconFactory.FilterType.SELECTION);
             }
             setIcon(icon);
             setFont(defaultFont);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/ImageRendererColumn.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/ImageRendererColumn.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/ImageRendererColumn.java
index 7380d90..0506650 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/ImageRendererColumn.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/ImageRendererColumn.java
@@ -40,9 +40,6 @@ public class ImageRendererColumn extends DefaultTableCellRenderer {
         setText(((JLabel) value).getText());
         setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
         Icon icon = ((JLabel) value).getIcon();
-        if(isSelected) {
-            icon = FilteredIconFactory.createIcon(icon, FilteredIconFactory.FilterType.SELECTION);
-        }
         setIcon(icon);
         return this;
     }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/image/FilteredIconFactory.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/image/FilteredIconFactory.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/image/FilteredIconFactory.java
index cb92b1c..e6ce46c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/image/FilteredIconFactory.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/image/FilteredIconFactory.java
@@ -91,24 +91,24 @@ public class FilteredIconFactory {
 
     static class DisabledFilter extends RGBImageFilter {
 
+        private static final double COLOR_FACTOR = 0.4;
+        private static final double ALPHA_FACTOR = 0.5;
+
         DisabledFilter() {
             canFilterIndexColorModel = true;
         }
 
         public int filterRGB(int x, int y, int rgb) {
-            // find the average of red, green, and blue
-            float avg = (((rgb >> 16) & 0xff) / 255f +
-                    ((rgb >>  8) & 0xff) / 255f +
-                    ( rgb        & 0xff) / 255f) / 3;
-            // pull out the alpha channel
-            float alpha = ((rgb >> 24) & 0xff) / 255f;
-            // calc the average
-            avg = Math.min(1.0f, (1f - avg)/(100.0f/35.0f) + avg);
-            // turn back into argb
-            return  (int)(alpha * 120f) << 24 |
-                    (int)(avg   * 255f) << 16 |
-                    (int)(avg   * 255f) <<  8 |
-                    (int)(avg   * 255f);
+            int a = (rgb >> 24) & 0xff;
+            int r = (rgb >> 16) & 0xff;
+            int g = (rgb >>  8) & 0xff;
+            int b = (rgb      ) & 0xff;
+            int luminance = (int)((1 - COLOR_FACTOR) * Math.min(255.0, (r + g + b) / 3.0));
+
+            return  (int)(a * ALPHA_FACTOR) << 24 |
+                    (int)(r * COLOR_FACTOR + luminance) << 16 |
+                    (int)(g * COLOR_FACTOR + luminance) <<  8 |
+                    (int)(b * COLOR_FACTOR + luminance);
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/control/FileMenuItem.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/control/FileMenuItem.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/control/FileMenuItem.java
index 95746b3..d65d4e6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/control/FileMenuItem.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/control/FileMenuItem.java
@@ -43,7 +43,6 @@ public class FileMenuItem extends CayenneAction.CayenneMenuItem {
         // excludes most generic action keys that are not applicable here...
         setIcon(a != null ? (Icon) a.getValue(Action.SMALL_ICON) : null);
         setEnabled(a == null || a.isEnabled());
-        updateActiveIcon();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/CayenneModeler.jpg
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/CayenneModeler.jpg b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/CayenneModeler.jpg
deleted file mode 100644
index 6167724..0000000
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/CayenneModeler.jpg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/CayenneModeler.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/CayenneModeler.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/CayenneModeler.png
new file mode 100644
index 0000000..5619fd7
Binary files /dev/null and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/CayenneModeler.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-attribute.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-attribute.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-attribute.png
index 77a68eb..f5b324d 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-attribute.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-attribute.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-copy.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-copy.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-copy.png
index 3fb5c81..4f555c2 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-copy.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-copy.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-create-method.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-create-method.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-create-method.png
index 436fc06..fc27412 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-create-method.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-create-method.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-cut.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-cut.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-cut.png
index 04069de..c5b63aa 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-cut.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-cut.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-datamap.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-datamap.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-datamap.png
index 2ea96ca..90db1af 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-datamap.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-datamap.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbentity.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbentity.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbentity.png
index 87d9d8a..07b6a75 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbentity.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbentity.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dom.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dom.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dom.png
index ce18f5f..4736338 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dom.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dom.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-edit.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-edit.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-edit.png
index 027c482..a874d51 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-edit.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-edit.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-embeddable.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-embeddable.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-embeddable.png
index 2f29083..38d03ea 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-embeddable.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-embeddable.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-eomodel.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-eomodel.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-eomodel.png
new file mode 100755
index 0000000..ddae288
Binary files /dev/null and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-eomodel.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-error.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-error.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-error.png
index f07791d..522ba12 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-error.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-error.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-filter.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-filter.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-filter.png
index 32d9225..d5a15e6 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-filter.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-filter.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-gen_java.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-gen_java.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-gen_java.png
index 1306768..c341424 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-gen_java.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-gen_java.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-info.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-info.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-info.png
index 2889af9..a874d51 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-info.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-info.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-inheritance.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-inheritance.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-inheritance.png
index 6805623..c04044b 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-inheritance.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-inheritance.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-move_down.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-move_down.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-move_down.png
index a766648..97f9a64 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-move_down.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-move_down.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-move_up.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-move_up.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-move_up.png
index af310a0..c69cce9 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-move_up.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-move_up.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new.png
index da6d1d6..cc18517 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_embeddable.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_embeddable.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_embeddable.png
index 2f5606c..38d03ea 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_embeddable.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_embeddable.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_objentity.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_objentity.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_objentity.png
index 8735d7a..7530e05 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_objentity.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_objentity.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_query.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_query.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_query.png
index 8d9e7fa..5e16395 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_query.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_query.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-node.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-node.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-node.png
index 2ff4383..fe0f402 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-node.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-node.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-objentity.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-objentity.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-objentity.png
index b8f85e3..baf6f14 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-objentity.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-objentity.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-open.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-open.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-open.png
index 1f9589a..25569bb 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-open.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-open.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-paste.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-paste.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-paste.png
index f3d4acb..8082d46 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-paste.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-paste.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-plus.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-plus.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-plus.png
index 2c9ed93..e685b0d 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-plus.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-plus.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-query.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-query.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-query.png
index 5bac20d..4c798ee 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-query.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-query.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-redo.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-redo.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-redo.png
index 15b1183..dab2850 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-redo.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-redo.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-refresh.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-refresh.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-refresh.png
index 3d68160..a108fe0 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-refresh.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-refresh.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-relationship.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-relationship.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-relationship.png
index 44ed7eb..c7d6610 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-relationship.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-relationship.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-save-as-image.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-save-as-image.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-save-as-image.png
index e1c910a..f9ad35c 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-save-as-image.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-save-as-image.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-save.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-save.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-save.png
index 374bd6f..f49898f 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-save.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-save.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-stored-procedure.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-stored-procedure.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-stored-procedure.png
index ef9f396..efae280 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-stored-procedure.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-stored-procedure.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-sync.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-sync.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-sync.png
index 03e8623..d194ea7 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-sync.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-sync.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-trash.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-trash.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-trash.png
index 8d031f2..333477a 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-trash.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-trash.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-tree-collapse.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-tree-collapse.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-tree-collapse.png
index 64291d5..3f2c9ff 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-tree-collapse.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-tree-collapse.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-undo.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-undo.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-undo.png
index 96f7b2b..7077a29 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-undo.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-undo.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-zoom-in.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-zoom-in.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-zoom-in.png
index 71218f2..189ef6b 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-zoom-in.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-zoom-in.png differ

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c55e46f0/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-zoom-out.png
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-zoom-out.png b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-zoom-out.png
index f53751e..3e377a8 100755
Binary files a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-zoom-out.png and b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-zoom-out.png differ


Mime
View raw message