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 2020/02/05 09:38:33 UTC
[cayenne] branch master updated (9d38f7d -> 7ea5988)
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git.
from 9d38f7d Update Velocity properties' names, old are deprecated
new 6d92cbf Add missing argument in the ModelerLogger
new 7ea5988 Cleanup
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../cayenne/modeler/editor/cgen/CodeGeneratorController.java | 8 ++++----
.../main/java/org/apache/cayenne/modeler/util/ModelerLogger.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
[cayenne] 02/02: Cleanup
Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 7ea5988e5dfb64e13f166d40126e28403f51e60e
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Wed Feb 5 12:33:45 2020 +0300
Cleanup
---
.../cayenne/modeler/editor/cgen/CodeGeneratorController.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java
index 29882f3..afa8e82 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java
@@ -73,8 +73,8 @@ public class CodeGeneratorController extends CayenneController implements ObjEnt
/**
* Logger to print stack traces
*/
- private static Logger logObj = LoggerFactory.getLogger(ErrorDebugDialog.class);
- protected static Icon errorIcon = ModelerUtil.buildIcon("icon-error.png");
+ private static final Logger LOGGER = LoggerFactory.getLogger(ErrorDebugDialog.class);
+ private static final Icon ERROR_ICON = ModelerUtil.buildIcon("icon-error.png");
public static final String SELECTED_PROPERTY = "selected";
protected ProjectController projectController;
@@ -193,7 +193,7 @@ public class CodeGeneratorController extends CayenneController implements ObjEnt
this.getView(),
"Class generation finished");
} catch (Exception e) {
- logObj.error("Error generating classes", e);
+ LOGGER.error("Error generating classes", e);
JOptionPane.showMessageDialog(
this.getView(),
"Error generating classes - " + e.getMessage());
@@ -352,7 +352,7 @@ public class CodeGeneratorController extends CayenneController implements ObjEnt
JLabel labelIcon = new JLabel();
labelIcon.setVisible(true);
if(validationFailure != null) {
- labelIcon.setIcon(errorIcon);
+ labelIcon.setIcon(ERROR_ICON);
labelIcon.setToolTipText(validationFailure.getDescription());
}
return labelIcon;
[cayenne] 01/02: Add missing argument in the ModelerLogger
Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 6d92cbfbc09d9693c02e7517364b37d9f342279a
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Wed Feb 5 12:33:29 2020 +0300
Add missing argument in the ModelerLogger
---
.../src/main/java/org/apache/cayenne/modeler/util/ModelerLogger.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerLogger.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerLogger.java
index a042d9f..a26c648 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerLogger.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerLogger.java
@@ -368,7 +368,7 @@ public class ModelerLogger implements Logger {
@Override
public void trace(String message, Object object, Object secondObject) {
- consoleLog(LOG_LEVEL_TRACE, message, secondObject);
+ consoleLog(LOG_LEVEL_TRACE, message, object, secondObject);
log("TRACE", message, null, LogConsole.DEBUG_STYLE, object, secondObject);
}
@@ -444,7 +444,7 @@ public class ModelerLogger implements Logger {
@Override
public void warn(String message, Object object, Object secondObject) {
- consoleLog(LOG_LEVEL_WARNING, message, secondObject);
+ consoleLog(LOG_LEVEL_WARNING, message, object, secondObject);
log("WARN", message, null, LogConsole.WARN_STYLE, object, secondObject);
}