Repository: cayenne Updated Branches: refs/heads/master 560086e24 -> 45da5a0d1
Some fixes in modeler Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/14d1aeec Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/14d1aeec Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/14d1aeec Branch: refs/heads/master Commit: 14d1aeec5c9b6f3ee637b9d3e1d1a2e83d15750f Parents: 560086e Author: Arseni Bulatski <ancars...@gmail.com> Authored: Mon Nov 26 17:22:05 2018 +0300 Committer: Arseni Bulatski <ancars...@gmail.com> Committed: Mon Nov 26 17:28:30 2018 +0300 ---------------------------------------------------------------------- .../modeler/CayenneModelerController.java | 10 +-- .../apache/cayenne/modeler/ProjectTreeView.java | 2 +- .../action/ReverseEngineeringAction.java | 4 +- .../dialog/db/load/ModelerDbImportAction.java | 19 +++-- .../modeler/editor/DbImportController.java | 83 ++++++++++++++++++++ .../editor/GlobalDbImportController.java | 77 ------------------ .../editor/cgen/CodeGeneratorController.java | 6 +- .../dbimport/domain/DbImportTabController.java | 2 +- .../cayenne/modeler/util/ModelerLogFactory.java | 13 ++- .../cayenne/modeler/util/ModelerLogger.java | 6 +- .../cayenne/modeler/util/NoopModelerLogger.java | 43 ++++++++++ 11 files changed, 159 insertions(+), 106 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/14d1aeec/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 e92d27a..3c1549b 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 @@ -23,7 +23,7 @@ import org.apache.cayenne.modeler.action.ExitAction; import org.apache.cayenne.modeler.action.OpenProjectAction; import org.apache.cayenne.modeler.dialog.validator.ValidatorDialog; import org.apache.cayenne.modeler.editor.EditorView; -import org.apache.cayenne.modeler.editor.GlobalDbImportController; +import org.apache.cayenne.modeler.editor.DbImportController; import org.apache.cayenne.modeler.init.platform.PlatformInitializer; import org.apache.cayenne.modeler.pref.ComponentGeometry; import org.apache.cayenne.modeler.pref.FSPath; @@ -65,7 +65,7 @@ public class CayenneModelerController extends CayenneController { protected CayenneModelerFrame frame; private EditorView editorView; - private GlobalDbImportController globalDbImportController; + private DbImportController dbImportController; public CayenneModelerController(){} @@ -75,7 +75,7 @@ public class CayenneModelerController extends CayenneController { this.frame = new CayenneModelerFrame(application.getActionManager()); application.getInjector().getInstance(PlatformInitializer.class).setupMenus(frame); this.projectController = new ProjectController(this); - this.globalDbImportController = new GlobalDbImportController(); + this.dbImportController = new DbImportController(); } @Override @@ -301,8 +301,8 @@ public class CayenneModelerController extends CayenneController { } } - public GlobalDbImportController getGlobalDbImportController() { - return globalDbImportController; + public DbImportController getDbImportController() { + return dbImportController; } class ExpireThread extends Thread { http://git-wip-us.apache.org/repos/asf/cayenne/blob/14d1aeec/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java index c2434f4..3cca6e9 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java @@ -642,7 +642,7 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener, positionNode(domainNode, newMapNode, Comparators .getDataDomainChildrenComparator()); - if(!Application.getInstance().getFrameController().getGlobalDbImportController().isGlobalImport()) { + if(!Application.getInstance().getFrameController().getDbImportController().isGlobalImport()) { showNode(newMapNode); } } http://git-wip-us.apache.org/repos/asf/cayenne/blob/14d1aeec/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java index 3146384..331bd54 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java @@ -25,7 +25,7 @@ import org.apache.cayenne.modeler.dialog.db.DbActionOptionsDialog; import org.apache.cayenne.modeler.dialog.db.load.DbLoadResultDialog; import org.apache.cayenne.modeler.dialog.db.load.DbLoaderContext; import org.apache.cayenne.modeler.dialog.db.load.LoadDataMapTask; -import org.apache.cayenne.modeler.editor.GlobalDbImportController; +import org.apache.cayenne.modeler.editor.DbImportController; import org.apache.cayenne.modeler.editor.dbimport.DbImportView; import org.apache.cayenne.modeler.pref.DBConnectionInfo; import org.apache.cayenne.modeler.pref.DataMapDefaults; @@ -86,7 +86,7 @@ public class ReverseEngineeringAction extends DBWizardAction<DbActionOptionsDial return; } - GlobalDbImportController dbImportController = Application.getInstance().getFrameController().getGlobalDbImportController(); + DbImportController dbImportController = Application.getInstance().getFrameController().getDbImportController(); DbLoadResultDialog dbLoadResultDialog = dbImportController.createDialog(); if(!dbLoadResultDialog.isVisible()) { dbImportController.showDialog(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/14d1aeec/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java index a88c90b..b38fb8b 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java @@ -22,7 +22,6 @@ package org.apache.cayenne.modeler.dialog.db.load; import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.configuration.DataChannelDescriptorLoader; import org.apache.cayenne.configuration.DataMapLoader; -import org.apache.cayenne.configuration.event.DataMapEvent; import org.apache.cayenne.configuration.server.DataSourceFactory; import org.apache.cayenne.configuration.server.DbAdapterFactory; import org.apache.cayenne.configuration.xml.DataChannelMetaData; @@ -33,7 +32,7 @@ import org.apache.cayenne.dbsync.reverse.dbimport.DefaultDbImportAction; import org.apache.cayenne.di.Inject; import org.apache.cayenne.map.DataMap; import org.apache.cayenne.modeler.Application; -import org.apache.cayenne.modeler.editor.GlobalDbImportController; +import org.apache.cayenne.modeler.editor.DbImportController; import org.apache.cayenne.project.ProjectSaver; import org.slf4j.Logger; @@ -58,7 +57,7 @@ public class ModelerDbImportAction extends DefaultDbImportAction { private DbLoadResultDialog resultDialog; private boolean isNothingChanged; - private GlobalDbImportController globalDbImportController; + private DbImportController dbImportController; public ModelerDbImportAction(@Inject Logger logger, @Inject ProjectSaver projectSaver, @@ -69,7 +68,7 @@ public class ModelerDbImportAction extends DefaultDbImportAction { @Inject DataChannelMetaData metaData, @Inject DataChannelDescriptorLoader dataChannelDescriptorLoader) { super(logger, projectSaver, dataSourceFactory, adapterFactory, mapLoader, mergerTokenFactoryProvider, dataChannelDescriptorLoader, metaData); - globalDbImportController = Application.getInstance().getFrameController().getGlobalDbImportController(); + dbImportController = Application.getInstance().getFrameController().getDbImportController(); } @Override @@ -81,12 +80,11 @@ public class ModelerDbImportAction extends DefaultDbImportAction { public void commit() throws Exception { commit(config, sourceDataMap); - Application.getInstance().getFrameController().getProjectController().fireDataMapEvent(new DataMapEvent(this, targetMap)); } @Override protected Collection<MergerToken> log(List<MergerToken> tokens) { - resultDialog = globalDbImportController.createDialog(); + resultDialog = dbImportController.createDialog(); logger.info(""); if (tokens.isEmpty()) { logger.info("Detected changes: No changes to import."); @@ -129,14 +127,15 @@ public class ModelerDbImportAction extends DefaultDbImportAction { private void resetDialog() { resultDialog.setVisible(false); - globalDbImportController.resetDialog(); + dbImportController.resetDialog(); } private void checkForUnusedImports() { - globalDbImportController.checkImport(targetMap); - if(globalDbImportController.createDialog().getTableForMap().isEmpty()) { + dbImportController.checkImport(targetMap); + if(dbImportController.createDialog().getTableForMap().isEmpty()) { resetDialog(); - globalDbImportController.setGlobalImport(false); + dbImportController.setGlobalImport(false); + dbImportController.fireDataMapChangeEvent(targetMap); } } http://git-wip-us.apache.org/repos/asf/cayenne/blob/14d1aeec/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DbImportController.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DbImportController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DbImportController.java new file mode 100644 index 0000000..932c739 --- /dev/null +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DbImportController.java @@ -0,0 +1,83 @@ +/***************************************************************** + * 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.editor; + +import org.apache.cayenne.configuration.event.DataMapEvent; +import org.apache.cayenne.map.DataMap; +import org.apache.cayenne.modeler.Application; +import org.apache.cayenne.modeler.dialog.db.load.DbLoadResultDialog; + +import javax.swing.JTable; +import javax.swing.table.DefaultTableModel; +import java.util.concurrent.ConcurrentMap; + +/** + * @since 4.1 + */ +public class DbImportController { + + private static final String DIALOG_TITLE = "Reverse Engineering Result"; + + private DbLoadResultDialog dbLoadResultDialog; + private boolean globalImport; + + public DbImportController() { + this.dbLoadResultDialog = new DbLoadResultDialog(DIALOG_TITLE); + } + + public DbLoadResultDialog createDialog() { + return dbLoadResultDialog; + } + + public void showDialog() { + dbLoadResultDialog.pack(); + dbLoadResultDialog.setVisible(true); + } + + public void setGlobalImport(boolean globalImport) { + this.globalImport = globalImport; + } + + public boolean isGlobalImport() { + return globalImport; + } + + public void checkImport(DataMap dataMap) { + dbLoadResultDialog.getTableForMap().remove(dataMap); + } + + public void resetDialog() { + ConcurrentMap<DataMap, JTable> tableMap = dbLoadResultDialog.getTableForMap(); + for(DataMap dataMap : tableMap.keySet()) { + JTable table = tableMap.get(dataMap); + DefaultTableModel tableModel = (DefaultTableModel) table.getModel(); + int rowCount = tableModel.getRowCount(); + for (int i = rowCount - 1; i >= 0; i--) { + tableModel.removeRow(i); + } + } + + dbLoadResultDialog.getTableForMap().clear(); + dbLoadResultDialog.getTablePanel().removeAll(); + } + + public void fireDataMapChangeEvent(DataMap dataMap) { + Application.getInstance().getFrameController().getProjectController().fireDataMapEvent(new DataMapEvent(this, dataMap)); + } +} http://git-wip-us.apache.org/repos/asf/cayenne/blob/14d1aeec/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GlobalDbImportController.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GlobalDbImportController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GlobalDbImportController.java deleted file mode 100644 index ec09d81..0000000 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GlobalDbImportController.java +++ /dev/null @@ -1,77 +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.editor; - -import org.apache.cayenne.map.DataMap; -import org.apache.cayenne.modeler.dialog.db.load.DbLoadResultDialog; - -import javax.swing.JTable; -import javax.swing.table.DefaultTableModel; -import java.util.concurrent.ConcurrentMap; - -/** - * @since 4.1 - */ -public class GlobalDbImportController { - - private static final String DIALOG_TITLE = "Reverse Engineering Result"; - - private DbLoadResultDialog dbLoadResultDialog; - private boolean globalImport; - - public GlobalDbImportController() { - this.dbLoadResultDialog = new DbLoadResultDialog(DIALOG_TITLE); - } - - public DbLoadResultDialog createDialog() { - return dbLoadResultDialog; - } - - public void showDialog() { - dbLoadResultDialog.pack(); - dbLoadResultDialog.setVisible(true); - } - - public void setGlobalImport(boolean globalImport) { - this.globalImport = globalImport; - } - - public boolean isGlobalImport() { - return globalImport; - } - - public void checkImport(DataMap dataMap) { - dbLoadResultDialog.getTableForMap().remove(dataMap); - } - - public void resetDialog() { - ConcurrentMap<DataMap, JTable> tableMap = dbLoadResultDialog.getTableForMap(); - for(DataMap dataMap : tableMap.keySet()) { - JTable table = tableMap.get(dataMap); - DefaultTableModel tableModel = (DefaultTableModel) table.getModel(); - int rowCount = tableModel.getRowCount(); - for (int i = rowCount - 1; i >= 0; i--) { - tableModel.removeRow(i); - } - } - - dbLoadResultDialog.getTableForMap().clear(); - dbLoadResultDialog.getTablePanel().removeAll(); - } -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/14d1aeec/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java ---------------------------------------------------------------------- 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 b2fc012..cb7b50b 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 @@ -32,7 +32,7 @@ import org.apache.cayenne.map.event.EntityEvent; import org.apache.cayenne.map.event.ObjEntityListener; import org.apache.cayenne.modeler.ProjectController; import org.apache.cayenne.modeler.dialog.ErrorDebugDialog; -import org.apache.cayenne.modeler.dialog.db.load.ModelerDbImportAction; +import org.apache.cayenne.modeler.editor.DbImportController; import org.apache.cayenne.modeler.util.CayenneController; import org.apache.cayenne.swing.BindingBuilder; import org.slf4j.Logger; @@ -200,10 +200,10 @@ public class CodeGeneratorController extends CodeGeneratorControllerBase impleme @Override public void dataMapChanged(DataMapEvent e) { - if(e.getSource() instanceof ModelerDbImportAction) { + if(e.getSource() instanceof DbImportController) { CgenConfiguration cgenConfiguration = getCurrentConfiguration(); if(cgenConfiguration != null) { - for(ObjEntity objEntity : dataMap.getObjEntities()) { + for(ObjEntity objEntity : e.getDataMap().getObjEntities()) { if(!cgenConfiguration.getExcludeEntityArtifacts().contains(objEntity.getName())) { addEntity(cgenConfiguration.getDataMap(), objEntity); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/14d1aeec/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/domain/DbImportTabController.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/domain/DbImportTabController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/domain/DbImportTabController.java index b5dad5a..04519ef 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/domain/DbImportTabController.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/domain/DbImportTabController.java @@ -45,7 +45,7 @@ public class DbImportTabController extends GeneratorsTabController { view.showEmptyMessage(); return; } - Application.getInstance().getFrameController().getGlobalDbImportController().setGlobalImport(true); + Application.getInstance().getFrameController().getDbImportController().setGlobalImport(true); ReverseEngineeringAction reverseEngineeringAction = Application.getInstance().getActionManager().getAction(ReverseEngineeringAction.class); for(DataMap dataMap : dataMaps) { projectController.setCurrentDataMap(dataMap); http://git-wip-us.apache.org/repos/asf/cayenne/blob/14d1aeec/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerLogFactory.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerLogFactory.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerLogFactory.java index 1a2aec0..a859b3c 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerLogFactory.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerLogFactory.java @@ -18,11 +18,11 @@ ****************************************************************/ package org.apache.cayenne.modeler.util; +import org.slf4j.ILoggerFactory; + import java.util.HashMap; import java.util.Map; -import org.slf4j.ILoggerFactory; - /** * Factory for creating ModelerLogger instances. */ @@ -33,6 +33,8 @@ public class ModelerLogFactory implements ILoggerFactory { */ protected Map<String, ModelerLogger> localCache; + private static final String ignoreVelocoty = "org.apache.velocity"; + public ModelerLogFactory() { localCache = new HashMap<>(); } @@ -40,8 +42,11 @@ public class ModelerLogFactory implements ILoggerFactory { public ModelerLogger getLogger(String name) { ModelerLogger local = localCache.get(name); if (local == null) { - //Logger def = LoggerFactory.getLogger(name); - local = new ModelerLogger(name); + if(name.contains(ignoreVelocoty)) { + local = new NoopModelerLogger(name); + } else { + local = new ModelerLogger(name); + } localCache.put(name, local); } return local; http://git-wip-us.apache.org/repos/asf/cayenne/blob/14d1aeec/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerLogger.java ---------------------------------------------------------------------- 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 5f2fb37..8032728 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 @@ -42,7 +42,7 @@ public class ModelerLogger implements Logger { private static final byte LOG_LEVEL_WARNING = 3; private static final byte LOG_LEVEL_ERROR = 4; - private static final String INFO_LOG_NAME = "INFO"; + static final String INFO_LOG_NAME = "INFO"; private static final String DEBUG_LOG_NAME = "DEBUG"; private static final String TRACE_LOG_NAME = "TRACE"; private static final String WARNING_LOG_NAME = "WARNING"; @@ -498,12 +498,12 @@ public class ModelerLogger implements Logger { * Prints common message to the modeler console */ - private void log(String level, String message, Throwable throwable, AttributeSet style, Object... parameters) { + void log(String level, String message, Throwable throwable, AttributeSet style, Object... parameters) { FormattingTuple tuple = MessageFormatter.arrayFormat(message, parameters); getLogConsole().appendMessage(level, tuple.getMessage(), throwable, style); } - private void log(String level, Object message, Throwable throwable, AttributeSet style) { + void log(String level, Object message, Throwable throwable, AttributeSet style) { getLogConsole().appendMessage(level, String.valueOf(message), throwable, style); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/14d1aeec/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/NoopModelerLogger.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/NoopModelerLogger.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/NoopModelerLogger.java new file mode 100644 index 0000000..3aa30b7 --- /dev/null +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/NoopModelerLogger.java @@ -0,0 +1,43 @@ +/***************************************************************** + * 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.util; + +import javax.swing.text.AttributeSet; + +/** + * @since 4.1 + */ +class NoopModelerLogger extends ModelerLogger { + + NoopModelerLogger(String name) { + super(name); + } + + void log(String level, String message, Throwable throwable, AttributeSet style, Object... parameters) { + if(level.equals(INFO_LOG_NAME)) { + super.log(level, message, throwable, style, parameters); + } + } + + void log(String level, Object message, Throwable throwable, AttributeSet style) { + if(level.equals(INFO_LOG_NAME)) { + super.log(level, message, throwable, style); + } + } +}