You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2013/08/15 14:57:02 UTC
[5/6] ISIS-490: switching from log4j to slf4j
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ForeignKeyInChildCollectionMapper.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ForeignKeyInChildCollectionMapper.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ForeignKeyInChildCollectionMapper.java
index 4a04def..b289450 100644
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ForeignKeyInChildCollectionMapper.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ForeignKeyInChildCollectionMapper.java
@@ -24,7 +24,8 @@ package org.apache.isis.objectstore.sql.auto;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
@@ -40,7 +41,7 @@ import org.apache.isis.objectstore.sql.ObjectMappingLookup;
* @author Kevin
*/
public class ForeignKeyInChildCollectionMapper extends ForeignKeyCollectionMapper {
- private static final Logger LOG = Logger.getLogger(ForeignKeyCollectionMapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ForeignKeyCollectionMapper.class);
protected final ObjectAssociation priorField; // prevents recursion
protected final List<ObjectAssociation> priorFields;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionBaseMapper.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionBaseMapper.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionBaseMapper.java
index 7c66b2f..359a44d 100755
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionBaseMapper.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionBaseMapper.java
@@ -26,7 +26,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
@@ -59,7 +60,7 @@ import org.apache.isis.objectstore.sql.mapping.FieldMapping;
*/
public class PolymorphicForeignKeyInChildCollectionBaseMapper extends ForeignKeyInChildCollectionMapper {
- private static final Logger LOG = Logger.getLogger(PolymorphicForeignKeyInChildCollectionBaseMapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PolymorphicForeignKeyInChildCollectionBaseMapper.class);
private final String classColumnName;
private final String itemIdColumnName;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionMapper.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionMapper.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionMapper.java
index c9cf53c..4bf0928 100755
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionMapper.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionMapper.java
@@ -29,7 +29,8 @@ import java.util.Map;
import com.google.common.collect.Lists;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -54,7 +55,7 @@ import org.apache.isis.objectstore.sql.mapping.FieldMapping;
*/
public class PolymorphicForeignKeyInChildCollectionMapper extends ForeignKeyInChildCollectionMapper {
- private static final Logger LOG = Logger.getLogger(PolymorphicForeignKeyInChildCollectionMapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PolymorphicForeignKeyInChildCollectionMapper.class);
private final ObjectAssociation baseField;
private final List<String> tables;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ReversedAutoAssociationMapper.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ReversedAutoAssociationMapper.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ReversedAutoAssociationMapper.java
index e0c4649..7169b23 100644
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ReversedAutoAssociationMapper.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ReversedAutoAssociationMapper.java
@@ -23,7 +23,8 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -47,7 +48,7 @@ import org.apache.isis.objectstore.sql.mapping.ObjectReferenceMapping;
* known to parent
*/
public class ReversedAutoAssociationMapper extends AbstractAutoMapper implements CollectionMapper {
- private static final Logger LOG = Logger.getLogger(ReversedAutoAssociationMapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ReversedAutoAssociationMapper.class);
private final ObjectAssociation field;
private final ObjectReferenceMapping idMapping;
private final VersionMapping versionMapping;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/jdbc/JdbcConnector.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/jdbc/JdbcConnector.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/jdbc/JdbcConnector.java
index fa61a1e..9db5159 100644
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/jdbc/JdbcConnector.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/jdbc/JdbcConnector.java
@@ -29,7 +29,8 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.joda.time.DateTimeZone;
import org.joda.time.LocalDate;
@@ -43,7 +44,7 @@ import org.apache.isis.objectstore.sql.SqlObjectStore;
import org.apache.isis.objectstore.sql.SqlObjectStoreException;
public class JdbcConnector extends AbstractDatabaseConnector {
- private static final Logger LOG = Logger.getLogger(JdbcConnector.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JdbcConnector.class);
private Connection connection;
private final String baseName;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestCommonBase.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestCommonBase.java b/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestCommonBase.java
index 3e76efe..0747bcd 100755
--- a/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestCommonBase.java
+++ b/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestCommonBase.java
@@ -24,8 +24,10 @@ import java.io.IOException;
import java.sql.SQLException;
import java.util.Properties;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.FixMethodOrder;
@@ -116,7 +118,7 @@ public abstract class SqlIntegrationTestCommonBase {
@Before
public void setUpSystem() throws Exception {
- Logger.getRootLogger().setLevel(Level.INFO);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.INFO);
if (!getSqlIntegrationTestFixtures().getState().isInitialize()) {
return;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestData.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestData.java b/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestData.java
index 4ff5205..dcb5db1 100644
--- a/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestData.java
+++ b/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestData.java
@@ -29,8 +29,10 @@ import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.FixMethodOrder;
@@ -70,7 +72,7 @@ import org.apache.isis.objectstore.sql.common.SqlIntegrationTestFixtures.State;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public abstract class SqlIntegrationTestData extends SqlIntegrationTestCommonBase {
- private static final Logger LOG = Logger.getLogger(SqlIntegrationTestData.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SqlIntegrationTestData.class);
private static List<SimpleClass> simpleClassList1 = new ArrayList<SimpleClass>();
private static List<SimpleClass> simpleClassList2 = new ArrayList<SimpleClass>();
@@ -140,7 +142,7 @@ public abstract class SqlIntegrationTestData extends SqlIntegrationTestCommonBas
// NumericClasses
// standard min types
pve2 = factory.newPrimitiveValuedEntity();
- LOG.log(Level.INFO, "Bits to represent Double: " + Double.SIZE);
+ LOG.info( "Bits to represent Double: " + Double.SIZE);
pve2.setIntProperty(Data.intMinValue);
pve2.setShortProperty(Data.shortMinValue);
pve2.setLongProperty(Data.longMinValue);
@@ -291,15 +293,15 @@ public abstract class SqlIntegrationTestData extends SqlIntegrationTestCommonBas
*/
private void testApplibDate() {
- LOG.log(Level.INFO, "Test: testDate() '2010-3-5' = 1267747200000");
+ LOG.info("Test: testDate() '2010-3-5' = 1267747200000");
// 2010-3-5 = 1267747200000
- LOG.log(Level.INFO, "applibDate.dateValue() as String: " + Data.applibDate);
- LOG.log(Level.INFO, "applibDate.dateValue() as Long: " + Data.applibDate.getMillisSinceEpoch());
+ LOG.info( "applibDate.dateValue() as String: " + Data.applibDate);
+ LOG.info( "applibDate.dateValue() as Long: " + Data.applibDate.getMillisSinceEpoch());
// 2010-3-5 = 1267747200000
- LOG.log(Level.INFO, "sqlDataClass.getDate() as String: " + sqlDataClass.getDate());
- LOG.log(Level.INFO, "sqlDataClass.getDate().getTime() as Long: " + sqlDataClass.getDate().getMillisSinceEpoch());
+ LOG.info( "sqlDataClass.getDate() as String: " + sqlDataClass.getDate());
+ LOG.info( "sqlDataClass.getDate().getTime() as Long: " + sqlDataClass.getDate().getMillisSinceEpoch());
if (!Data.applibDate.isEqualTo(sqlDataClass.getDate())) {
fail("Applib date: Test '2010-3-5', expected " + Data.applibDate.toString() + ", but got "
@@ -318,19 +320,19 @@ public abstract class SqlIntegrationTestData extends SqlIntegrationTestCommonBas
*/
private void testSqlDate() {
- LOG.log(Level.INFO, "Test: testSqlDate() '2011-4-8' == 1302220800000");
+ LOG.info( "Test: testSqlDate() '2011-4-8' == 1302220800000");
// 2011-4-8 = 1302220800000
- LOG.log(Level.INFO, "sqlDate.toString() as String:" + Data.sqlDate); // shows
+ LOG.info( "sqlDate.toString() as String:" + Data.sqlDate); // shows
// as
// 2011-04-07
- LOG.log(Level.INFO, "sqlDate.getTime() as Long:" + Data.sqlDate.getTime());
+ LOG.info( "sqlDate.getTime() as Long:" + Data.sqlDate.getTime());
// 2011-4-8 = 1302220800000
- LOG.log(Level.INFO, "sqlDataClass.getSqlDate() as String:" + sqlDataClass.getSqlDate()); // shows
+ LOG.info( "sqlDataClass.getSqlDate() as String:" + sqlDataClass.getSqlDate()); // shows
// as
// 2011-04-07
- LOG.log(Level.INFO, "sqlDataClass.getSqlDate().getTime() as Long:" + sqlDataClass.getSqlDate().getTime());
+ LOG.info( "sqlDataClass.getSqlDate().getTime() as Long:" + sqlDataClass.getSqlDate().getTime());
if (Data.sqlDate.compareTo(sqlDataClass.getSqlDate()) != 0) {
fail("SQL date: Test '2011-4-8', expected " + Data.sqlDate.toString() + ", but got "
@@ -376,13 +378,13 @@ public abstract class SqlIntegrationTestData extends SqlIntegrationTestCommonBas
*/
private void testDateTime() {
- LOG.log(Level.INFO, "Test: testDateTime()");
- LOG.log(Level.INFO, "sqlDataClass.getDateTime() as String:" + sqlDataClass.getDateTime());
- LOG.log(Level.INFO, "dateTime.toString() as String:" + Data.dateTime);
+ LOG.info( "Test: testDateTime()");
+ LOG.info( "sqlDataClass.getDateTime() as String:" + sqlDataClass.getDateTime());
+ LOG.info( "dateTime.toString() as String:" + Data.dateTime);
- LOG.log(Level.INFO, "sqlDataClass.getDateTime().getTime() as Long:"
+ LOG.info( "sqlDataClass.getDateTime().getTime() as Long:"
+ sqlDataClass.getDateTime().millisSinceEpoch());
- LOG.log(Level.INFO, "dateTime.getTime() as Long:" + Data.dateTime.millisSinceEpoch());
+ LOG.info( "dateTime.getTime() as Long:" + Data.dateTime.millisSinceEpoch());
if (!Data.dateTime.equals(sqlDataClass.getDateTime())) {
fail("DateTime " + Data.dateTime.toString() + " is not expected " + sqlDataClass.getDateTime().toString());
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/XmlObjectStore.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/XmlObjectStore.java b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/XmlObjectStore.java
index fbe7fed..290e4d4 100644
--- a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/XmlObjectStore.java
+++ b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/XmlObjectStore.java
@@ -24,7 +24,8 @@ import java.util.List;
import com.google.common.collect.Lists;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -75,7 +76,7 @@ import org.apache.isis.objectstore.xml.internal.version.FileVersion;
public class XmlObjectStore implements ObjectStoreSpi {
- private static final Logger LOG = Logger.getLogger(XmlObjectStore.class);
+ private static final Logger LOG = LoggerFactory.getLogger(XmlObjectStore.class);
private static final String XMLOS_DIR = ConfigurationConstants.ROOT + "xmlos.dir";
private final DataManager dataManager;
private final ServiceManager serviceManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/AbstractXmlPersistenceCommand.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/AbstractXmlPersistenceCommand.java b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/AbstractXmlPersistenceCommand.java
index b986c93..356bcde 100644
--- a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/AbstractXmlPersistenceCommand.java
+++ b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/AbstractXmlPersistenceCommand.java
@@ -21,7 +21,8 @@ package org.apache.isis.objectstore.xml.internal.commands;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
@@ -33,7 +34,7 @@ import org.apache.isis.objectstore.xml.internal.data.DataManager;
import org.apache.isis.objectstore.xml.internal.data.ObjectData;
abstract class AbstractXmlPersistenceCommand extends PersistenceCommandAbstract {
- private static final Logger LOG = Logger.getLogger(AbstractXmlPersistenceCommand.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractXmlPersistenceCommand.class);
private final DataManager dataManager;
@@ -94,4 +95,4 @@ abstract class AbstractXmlPersistenceCommand extends PersistenceCommandAbstract
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlCreateObjectCommand.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlCreateObjectCommand.java b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlCreateObjectCommand.java
index 9912730..9cab4c9 100644
--- a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlCreateObjectCommand.java
+++ b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlCreateObjectCommand.java
@@ -19,7 +19,8 @@
package org.apache.isis.objectstore.xml.internal.commands;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.runtime.persistence.ObjectPersistenceException;
@@ -30,7 +31,7 @@ import org.apache.isis.objectstore.xml.internal.data.ObjectData;
import org.apache.isis.objectstore.xml.internal.version.FileVersion;
public final class XmlCreateObjectCommand extends AbstractXmlPersistenceCommand implements CreateObjectCommand {
- private static final Logger LOG = Logger.getLogger(XmlCreateObjectCommand.class);
+ private static final Logger LOG = LoggerFactory.getLogger(XmlCreateObjectCommand.class);
public XmlCreateObjectCommand(final ObjectAdapter adapter, final DataManager dataManager) {
super(adapter, dataManager);
@@ -51,4 +52,4 @@ public final class XmlCreateObjectCommand extends AbstractXmlPersistenceCommand
public String toString() {
return "CreateObjectCommand [object=" + onAdapter() + "]";
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlDestroyObjectCommand.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlDestroyObjectCommand.java b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlDestroyObjectCommand.java
index 736d2eb..e210443 100644
--- a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlDestroyObjectCommand.java
+++ b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlDestroyObjectCommand.java
@@ -19,7 +19,8 @@
package org.apache.isis.objectstore.xml.internal.commands;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
@@ -29,7 +30,7 @@ import org.apache.isis.core.runtime.persistence.objectstore.transaction.Persiste
import org.apache.isis.objectstore.xml.internal.data.DataManager;
public final class XmlDestroyObjectCommand extends AbstractXmlPersistenceCommand implements DestroyObjectCommand {
- private static final Logger LOG = Logger.getLogger(XmlDestroyObjectCommand.class);
+ private static final Logger LOG = LoggerFactory.getLogger(XmlDestroyObjectCommand.class);
public XmlDestroyObjectCommand(final ObjectAdapter adapter, final DataManager dataManager) {
super(adapter, dataManager);
@@ -49,4 +50,4 @@ public final class XmlDestroyObjectCommand extends AbstractXmlPersistenceCommand
public String toString() {
return "DestroyObjectCommand [object=" + onAdapter() + "]";
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlUpdateObjectCommand.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlUpdateObjectCommand.java b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlUpdateObjectCommand.java
index 9ca300d..2a0e3a1 100644
--- a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlUpdateObjectCommand.java
+++ b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlUpdateObjectCommand.java
@@ -19,7 +19,8 @@
package org.apache.isis.objectstore.xml.internal.commands;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.runtime.persistence.ObjectPersistenceException;
@@ -31,7 +32,7 @@ import org.apache.isis.objectstore.xml.internal.version.FileVersion;
public final class XmlUpdateObjectCommand extends AbstractXmlPersistenceCommand implements SaveObjectCommand {
- private static final Logger LOG = Logger.getLogger(XmlUpdateObjectCommand.class);
+ private static final Logger LOG = LoggerFactory.getLogger(XmlUpdateObjectCommand.class);
public XmlUpdateObjectCommand(final ObjectAdapter adapter, final DataManager dataManager) {
super(adapter, dataManager);
@@ -54,4 +55,4 @@ public final class XmlUpdateObjectCommand extends AbstractXmlPersistenceCommand
return "SaveObjectCommand [object=" + onAdapter() + "]";
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/profilestore/xml/pom.xml
----------------------------------------------------------------------
diff --git a/component/profilestore/xml/pom.xml b/component/profilestore/xml/pom.xml
index 74dca29..a3188e0 100644
--- a/component/profilestore/xml/pom.xml
+++ b/component/profilestore/xml/pom.xml
@@ -139,6 +139,13 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/profilestore/xml/src/test/java/org/apache/isis/profilestore/xml/internal/UserProfileDataHandlerTest.java
----------------------------------------------------------------------
diff --git a/component/profilestore/xml/src/test/java/org/apache/isis/profilestore/xml/internal/UserProfileDataHandlerTest.java b/component/profilestore/xml/src/test/java/org/apache/isis/profilestore/xml/internal/UserProfileDataHandlerTest.java
index 2457e2c..3091bae 100644
--- a/component/profilestore/xml/src/test/java/org/apache/isis/profilestore/xml/internal/UserProfileDataHandlerTest.java
+++ b/component/profilestore/xml/src/test/java/org/apache/isis/profilestore/xml/internal/UserProfileDataHandlerTest.java
@@ -27,8 +27,10 @@ import java.io.InputStreamReader;
import java.util.Arrays;
import java.util.List;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
@@ -78,7 +80,7 @@ public class UserProfileDataHandlerTest {
@Before
public void setup() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
service = new TestServiceObject1();
final IsisSessionFactory executionContextFactory = new IsisSessionFactoryDefault(DeploymentType.EXPLORATION, new IsisConfigurationDefault(), mockTemplateImageLoader, mockSpecificationLoader, mockAuthenticationManager,
mockAuthorizationManager, mockUserProfileLoader, mockPersistenceSessionFactory, Arrays.<Object>asList(service), new OidMarshaller());
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/security/file/src/main/java/org/apache/isis/security/file/authorization/FileAuthorizor.java
----------------------------------------------------------------------
diff --git a/component/security/file/src/main/java/org/apache/isis/security/file/authorization/FileAuthorizor.java b/component/security/file/src/main/java/org/apache/isis/security/file/authorization/FileAuthorizor.java
index 2c633bf..3bb1e57 100644
--- a/component/security/file/src/main/java/org/apache/isis/security/file/authorization/FileAuthorizor.java
+++ b/component/security/file/src/main/java/org/apache/isis/security/file/authorization/FileAuthorizor.java
@@ -38,7 +38,8 @@ import java.util.StringTokenizer;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -51,7 +52,7 @@ import org.apache.isis.core.runtime.authorization.standard.AuthorizorAbstract;
public class FileAuthorizor extends AuthorizorAbstract implements FileAuthorizorMBean {
- private static final Logger LOG = Logger.getLogger(FileAuthorizor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FileAuthorizor.class);
private static final String NONE = "";
private static final String ACCESS_QUALIFIER_RO = "-ro";
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/security/shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
----------------------------------------------------------------------
diff --git a/component/security/shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java b/component/security/shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
index 26c47c4..23c763a 100644
--- a/component/security/shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
+++ b/component/security/shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
@@ -32,7 +32,8 @@ import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
import org.apache.isis.core.runtime.authorization.standard.Authorizor;
import org.apache.isis.security.shiro.authorization.IsisPermission;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.UnavailableSecurityManagerException;
import org.apache.shiro.authc.AuthenticationException;
@@ -62,7 +63,7 @@ import com.google.common.collect.Lists;
*/
public class ShiroAuthenticatorOrAuthorizor implements Authenticator, Authorizor {
- private static final Logger LOG = Logger.getLogger(ShiroAuthenticatorOrAuthorizor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ShiroAuthenticatorOrAuthorizor.class);
private final IsisConfiguration configuration;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java
index 115d86d..8c1f315 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java
@@ -22,7 +22,8 @@ package org.apache.isis.viewer.dnd;
import java.awt.Dimension;
import java.util.StringTokenizer;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfigurationException;
@@ -100,7 +101,7 @@ import org.apache.isis.viewer.dnd.viewer.basic.WrappedTextFieldSpecification;
public class DndViewer extends IsisViewerAbstract {
- private static final Logger LOG = Logger.getLogger(DndViewer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DndViewer.class);
private static final String SPECIFICATION_BASE = Properties.PROPERTY_BASE + "specification.";
private ViewUpdateNotifier updateNotifier;
private ViewerFrame frame;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java
index 66928e0..7f5dbfb 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java
@@ -24,7 +24,8 @@ import java.awt.FontMetrics;
import java.awt.Frame;
import java.util.StringTokenizer;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.system.context.IsisContext;
@@ -35,7 +36,7 @@ import org.apache.isis.viewer.dnd.util.Properties;
public class AwtText implements Text {
private static final String ASCENT_ADJUST = Properties.PROPERTY_BASE + "ascent-adjust";
private static final String FONT_PROPERTY_STEM = Properties.PROPERTY_BASE + "font.";
- private static final Logger LOG = Logger.getLogger(AwtText.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AwtText.class);
private static final String SPACING_PROPERTYSTEM = Properties.PROPERTY_BASE + "spacing.";
private final boolean ascentAdjust;
private Font font;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java
index 5e87138..fa3b41a 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java
@@ -43,7 +43,8 @@ import java.awt.event.WindowEvent;
import java.net.URL;
import java.util.Vector;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
@@ -55,7 +56,7 @@ import org.apache.isis.viewer.dnd.view.debug.DebugOutput;
*/
public abstract class DebugFrame extends Frame {
private static final long serialVersionUID = 1L;
- private static final Logger LOG = Logger.getLogger(DebugFrame.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DebugFrame.class);
private static Vector<Frame> frames = new Vector<Frame>();
private int panel = 0;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java
index 5b584a4..8f423bf 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java
@@ -27,7 +27,8 @@ import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.viewer.dnd.drawing.Location;
@@ -44,7 +45,7 @@ import org.apache.isis.viewer.dnd.view.base.AbstractView;
import org.apache.isis.viewer.dnd.view.content.NullContent;
public class InteractionHandler implements MouseMotionListener, MouseListener, KeyListener {
- private static final Logger LOG = Logger.getLogger(InteractionHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(InteractionHandler.class);
private final static int THRESHOLD = 7;
private boolean canDrag;
/*
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java
index 05b35c5..91bbf37 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java
@@ -22,7 +22,8 @@ package org.apache.isis.viewer.dnd.awt;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.viewer.dnd.drawing.Location;
@@ -32,7 +33,7 @@ import org.apache.isis.viewer.dnd.view.KeyboardAction;
import org.apache.isis.viewer.dnd.view.View;
public class KeyboardManager {
- private static final Logger LOG = Logger.getLogger(KeyboardManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(KeyboardManager.class);
private final XViewer viewer;
private FocusManager focusManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java
index fb13b5e..efd6360 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java
@@ -38,7 +38,8 @@ import java.awt.event.KeyListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.lang.StringUtils;
@@ -47,7 +48,7 @@ import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword
public class LoginDialog extends Frame implements ActionListener, KeyListener {
private static final long serialVersionUID = 1L;
- private static final Logger LOG = Logger.getLogger(LoginDialog.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LoginDialog.class);
private final static int BORDER = 12;
private TextField user;
private TextField password;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/ShutdownDialog.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/ShutdownDialog.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/ShutdownDialog.java
index aec7d28..331c1a1 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/ShutdownDialog.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/ShutdownDialog.java
@@ -34,11 +34,12 @@ import java.awt.event.KeyListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class ShutdownDialog extends Dialog implements ActionListener, KeyListener {
private static final long serialVersionUID = 1L;
- private static final Logger LOG = Logger.getLogger(ShutdownDialog.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ShutdownDialog.class);
private final static int BORDER = 10;
private Button cancel;
private Button quit;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java
index c57d4d2..f2e052a 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java
@@ -33,7 +33,8 @@ import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -77,8 +78,8 @@ import org.apache.isis.viewer.dnd.viewer.ApplicationOptions;
public class XViewer implements Viewer {
private static final Size NO_SIZE = new Size(0, 0);
- private static final Logger LOG = Logger.getLogger(Viewer.class);
- private static final Logger UI_LOG = Logger.getLogger("ui." + Viewer.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(Viewer.class);
+ private static final Logger UI_LOG = LoggerFactory.getLogger("ui." + Viewer.class.getName());
private static final LoggingOptions LOGGING_OPTIONS = new LoggingOptions();
private static final NullView CLEAR_OVERLAY = new NullView();
private static final Bounds NO_REDRAW = new Bounds();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java
index d8dfc7e..bd3caf5 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.calendar;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.viewer.dnd.drawing.Bounds;
import org.apache.isis.viewer.dnd.drawing.Location;
@@ -37,7 +38,7 @@ import org.apache.isis.viewer.dnd.view.control.AbstractButtonAction;
import org.apache.isis.viewer.dnd.view.control.Button;
public class CalendarView extends CompositeView {
- private static final Logger LOG = Logger.getLogger(CalendarView.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CalendarView.class);
protected CalendarView(final Content content, final ViewSpecification specification) {
super(content, specification);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogSpecification.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogSpecification.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogSpecification.java
index 53febd7..c1be3ff 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogSpecification.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogSpecification.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.dialog;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
@@ -52,7 +53,7 @@ import org.apache.isis.viewer.dnd.view.control.AbstractButtonAction;
import org.apache.isis.viewer.dnd.view.control.CancelAction;
public class ActionDialogSpecification extends CompositeViewSpecification {
- private static final Logger LOG = Logger.getLogger(ActionDialogSpecification.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ActionDialogSpecification.class);
private static class DialogFormSubviews implements ViewFactory {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionFieldBuilder.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionFieldBuilder.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionFieldBuilder.java
index 9107dee..15fa6a8 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionFieldBuilder.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionFieldBuilder.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.dialog;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -36,7 +37,7 @@ import org.apache.isis.viewer.dnd.view.action.TextParseableParameter;
import org.apache.isis.viewer.dnd.view.composite.AbstractViewBuilder;
public class ActionFieldBuilder extends AbstractViewBuilder {
- private static final Logger LOG = Logger.getLogger(ActionFieldBuilder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ActionFieldBuilder.class);
private final ViewFactory subviewDesign;
public ActionFieldBuilder(final ViewFactory subviewDesign) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/drawing/Bounds.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/drawing/Bounds.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/drawing/Bounds.java
index 2d9f931..2ef1530 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/drawing/Bounds.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/drawing/Bounds.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.drawing;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Bounds represent a rectangular area on the screen. The top-left corner is
@@ -38,7 +39,7 @@ import org.apache.log4j.Logger;
* and 29.
*/
public class Bounds {
- Logger LOG = Logger.getLogger("Bounds");
+ Logger LOG = LoggerFactory.getLogger("Bounds");
int x;
int y;
int height;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/ImageField.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/ImageField.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/ImageField.java
index cfbce6c..6def485 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/ImageField.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/ImageField.java
@@ -28,7 +28,8 @@ import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.io.File;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -72,7 +73,7 @@ public class ImageField extends AbstractField {
}
}
- private static final Logger LOG = Logger.getLogger(ImageField.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ImageField.class);
private static final MediaTracker mt = new MediaTracker(new java.awt.Canvas());
public ImageField(final Content content, final ViewSpecification specification) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/TextField.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/TextField.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/TextField.java
index 58c3605..b2436a4 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/TextField.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/TextField.java
@@ -22,7 +22,8 @@ package org.apache.isis.viewer.dnd.field;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -57,7 +58,7 @@ import org.apache.isis.viewer.dnd.view.text.TextContent;
import org.apache.isis.viewer.dnd.view.text.TextSelection;
public abstract class TextField extends TextParseableFieldAbstract implements TextBlockTarget {
- private static final Logger LOG = Logger.getLogger(TextField.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TextField.class);
protected static final Text style = Toolkit.getText(ColorsAndFonts.TEXT_NORMAL);
protected CursorPosition cursor;
private boolean identified;
@@ -551,7 +552,7 @@ public abstract class TextField extends TextParseableFieldAbstract implements Te
}
LOG.debug("character at " + cursor.getCharacter() + " line " + cursor.getLine());
- LOG.debug(selection);
+ LOG.debug(selection.toString());
}
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/TextParseableFieldAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/TextParseableFieldAbstract.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/TextParseableFieldAbstract.java
index bc1a1c8..4ca43bb 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/TextParseableFieldAbstract.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/TextParseableFieldAbstract.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.field;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
@@ -28,7 +29,7 @@ import org.apache.isis.viewer.dnd.view.ViewSpecification;
import org.apache.isis.viewer.dnd.view.content.TextParseableContent;
public abstract class TextParseableFieldAbstract extends AbstractField {
- private static final Logger LOG = Logger.getLogger(TextField.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TextField.class);
protected TextParseableFieldAbstract(final Content content, final ViewSpecification design) {
super(content, design);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/WrappedTextField.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/WrappedTextField.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/WrappedTextField.java
index 34c4fab..4e6aa2e 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/WrappedTextField.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/WrappedTextField.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.field;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.viewer.dnd.drawing.Canvas;
@@ -34,7 +35,7 @@ import org.apache.isis.viewer.dnd.view.text.CursorPosition;
import org.apache.isis.viewer.dnd.view.text.TextContent;
public class WrappedTextField extends TextField {
- private static final Logger LOG = Logger.getLogger(WrappedTextField.class);
+ private static final Logger LOG = LoggerFactory.getLogger(WrappedTextField.class);
public WrappedTextField(final TextParseableContent content, final ViewSpecification specification, final boolean showLines) {
super(content, specification, showLines, TextContent.WRAPPING);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/help/ExternalHelpViewerProgram.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/help/ExternalHelpViewerProgram.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/help/ExternalHelpViewerProgram.java
index ec05f71..f94ef9d 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/help/ExternalHelpViewerProgram.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/help/ExternalHelpViewerProgram.java
@@ -21,13 +21,14 @@ package org.apache.isis.viewer.dnd.help;
import java.io.IOException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.viewer.dnd.drawing.Location;
public class ExternalHelpViewerProgram implements HelpViewer {
- private static final Logger LOG = Logger.getLogger(ExternalHelpViewerProgram.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ExternalHelpViewerProgram.class);
private final String program;
public ExternalHelpViewerProgram(final String program) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java
index 6317f6e..eb65a03 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.table;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.commons.ensure.Assert;
@@ -51,7 +52,7 @@ import org.apache.isis.viewer.dnd.view.field.TextParseableFieldImpl;
import org.apache.isis.viewer.dnd.viewer.basic.UnlinedTextFieldSpecification;
class TableCellBuilder extends AbstractViewBuilder {
- private static final Logger LOG = Logger.getLogger(TableCellBuilder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TableCellBuilder.class);
// REVIEW: should provide this rendering context, rather than hardcoding.
// the net effect currently is that class members annotated with
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/tree/TreeNodeBorder.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/tree/TreeNodeBorder.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/tree/TreeNodeBorder.java
index 9f548a1..413a86b 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/tree/TreeNodeBorder.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/tree/TreeNodeBorder.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.tree;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -66,7 +67,7 @@ public class TreeNodeBorder extends AbstractBorder {
private static final int BOX_SIZE = 9;
private static final int BOX_X_OFFSET = 5;
private final static Text LABEL_STYLE = Toolkit.getText(ColorsAndFonts.TEXT_NORMAL);
- private static final Logger LOG = Logger.getLogger(TreeNodeBorder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TreeNodeBorder.class);
private final int baseline;
private final IconGraphic icon;
private final ViewSpecification replaceWithSpecification;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/Axes.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/Axes.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/Axes.java
index 6bfea27..9bad2b4 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/Axes.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/Axes.java
@@ -22,13 +22,14 @@ package org.apache.isis.viewer.dnd.view;
import java.util.HashMap;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.viewer.dnd.util.ViewerException;
public class Axes {
- private static final Logger LOG = Logger.getLogger(Axes.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Axes.class);
private final Map<Class<?>, ViewAxis> axes = new HashMap<Class<?>, ViewAxis>();
public void add(final ViewAxis axis) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/action/BackgroundWork.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/action/BackgroundWork.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/action/BackgroundWork.java
index 9d0a6bb..ab47a4d 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/action/BackgroundWork.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/action/BackgroundWork.java
@@ -19,14 +19,15 @@
package org.apache.isis.viewer.dnd.view.action;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.exceptions.IsisApplicationException;
import org.apache.isis.viewer.dnd.view.BackgroundTask;
import org.apache.isis.viewer.dnd.view.View;
public final class BackgroundWork {
- private static final Logger LOG = Logger.getLogger(BackgroundTask.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BackgroundTask.class);
private static class BackgroundThread extends Thread {
private final View view;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java
index 79ae4eb..b04dc0a 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java
@@ -21,7 +21,8 @@ package org.apache.isis.viewer.dnd.view.base;
import java.util.Enumeration;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -74,7 +75,7 @@ import org.apache.isis.viewer.dnd.view.option.OpenViewOption;
import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
public abstract class AbstractView implements View {
- private static final Logger LOG = Logger.getLogger(AbstractView.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractView.class);
private static int nextId = 0;
private int id = 0;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java
index 535819a..24bb7af 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java
@@ -27,7 +27,8 @@ import java.util.Vector;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -45,7 +46,7 @@ import org.apache.isis.viewer.dnd.view.collection.RootCollection;
public class ViewUpdateNotifierImpl implements ViewUpdateNotifier {
- private static final Logger LOG = Logger.getLogger(ViewUpdateNotifierImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ViewUpdateNotifierImpl.class);
protected Map<ObjectAdapter, List<View>> viewListByAdapter = Maps.newHashMap();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeBorder.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeBorder.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeBorder.java
index 63f9f2f..553120f 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeBorder.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeBorder.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.view.border;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.viewer.dnd.drawing.Bounds;
@@ -37,8 +38,8 @@ import org.apache.isis.viewer.dnd.view.base.AbstractBorder;
import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
public abstract class ResizeBorder extends AbstractBorder {
- private static final Logger LOG = Logger.getLogger(ResizeBorder.class);
- private static final Logger UI_LOG = Logger.getLogger("ui." + ResizeBorder.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(ResizeBorder.class);
+ private static final Logger UI_LOG = LoggerFactory.getLogger("ui." + ResizeBorder.class.getName());
public static final int LEFT = 1;
public static final int RIGHT = 2;
public static final int UP = 4;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeDrag.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeDrag.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeDrag.java
index 08524b1..902b738 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeDrag.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeDrag.java
@@ -124,10 +124,10 @@ public class ResizeDrag extends DragImpl implements InternalDrag {
* public ViewResizeOutline(View forView, int direction, Location location,
* Size size) { super(forView.getContent(), null, null);
*
- * Logger.getLogger(getClass()).debug("drag outline for " + forView);
+ * LoggerFactory.getLogger(getClass()).debug("drag outline for " + forView);
* setLocation(location); setSize(size);
*
- * Logger.getLogger(getClass()).debug("drag outline initial size " +
+ * LoggerFactory.getLogger(getClass()).debug("drag outline initial size " +
* getSize() + " " + forView.getSize());
*
* origin = getBounds();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java
index be97b92..2d73959 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.view.border;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Allow;
@@ -39,7 +40,7 @@ import org.apache.isis.viewer.dnd.view.content.RootObject;
import org.apache.isis.viewer.dnd.view.control.AbstractButtonAction;
public class SaveTransientObjectBorder extends ButtonBorder {
- private static final Logger LOG = Logger.getLogger(SaveTransientObjectBorder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SaveTransientObjectBorder.class);
private static class CloseAction extends AbstractButtonAction {
public CloseAction() {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeOutline.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeOutline.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeOutline.java
index b67dc7a..44cf1e8 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeOutline.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeOutline.java
@@ -43,7 +43,7 @@ public class ViewResizeOutline extends AbstractView {
super.draw(canvas);
final Size s = getSize();
- // Logger.getLogger(getClass()).debug("drag outline size " + s);
+ // LoggerFactory.getLogger(getClass()).debug("drag outline size " + s);
final Color color = Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY2);
for (int i = 0; i < thickness; i++) {
canvas.drawRectangle(i, i, s.getWidth() - i * 2 - 1, s.getHeight() - i * 2 - 1, color);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java
index 01e7e7e..f2baec2 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java
@@ -21,7 +21,8 @@ package org.apache.isis.viewer.dnd.view.composite;
import java.util.Enumeration;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -37,7 +38,7 @@ import org.apache.isis.viewer.dnd.view.field.OneToManyField;
import org.apache.isis.viewer.dnd.view.field.OneToManyFieldElementImpl;
public class CollectionElementBuilder extends AbstractViewBuilder {
- private static final Logger LOG = Logger.getLogger(CollectionElementBuilder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CollectionElementBuilder.class);
private boolean canDragView = true;
private final ViewFactory subviewDesign;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java
index 245837b..0496842 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java
@@ -21,7 +21,8 @@ package org.apache.isis.viewer.dnd.view.composite;
import java.util.Vector;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -42,7 +43,7 @@ import org.apache.isis.viewer.dnd.view.ViewSpecification;
import org.apache.isis.viewer.dnd.view.base.ObjectView;
public abstract class CompositeView extends ObjectView {
- private static final Logger LOG = Logger.getLogger(CompositeView.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CompositeView.class);
private int buildCount = 0;
private boolean buildInvalid = true;
private boolean canDragView = true;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java
index eb18767..26cb45b 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java
@@ -21,7 +21,8 @@ package org.apache.isis.viewer.dnd.view.composite;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.filter.Filter;
@@ -44,7 +45,7 @@ import org.apache.isis.viewer.dnd.view.base.FieldErrorView;
import org.apache.isis.viewer.dnd.view.content.FieldContent;
public class ObjectFieldBuilder extends AbstractViewBuilder {
- private static final Logger LOG = Logger.getLogger(ObjectFieldBuilder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ObjectFieldBuilder.class);
// REVIEW: confirm this rendering context
private final Where where = Where.OBJECT_FORMS;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/control/CancelAction.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/control/CancelAction.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/control/CancelAction.java
index a8700d1..23a1911 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/control/CancelAction.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/control/CancelAction.java
@@ -19,14 +19,15 @@
package org.apache.isis.viewer.dnd.view.control;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.viewer.dnd.drawing.Location;
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.Workspace;
public class CancelAction extends AbstractButtonAction {
- private static final Logger LOG = Logger.getLogger(CancelAction.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CancelAction.class);
public CancelAction() {
super("Cancel");
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugDumpSnapshotOption.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugDumpSnapshotOption.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugDumpSnapshotOption.java
index 62ff97e..f08a8b6 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugDumpSnapshotOption.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugDumpSnapshotOption.java
@@ -23,8 +23,10 @@ import static org.apache.isis.core.commons.lang.CastUtils.enumerationOver;
import java.util.Enumeration;
-import org.apache.log4j.Appender;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.consent.Allow;
import org.apache.isis.core.metamodel.consent.Consent;
@@ -46,9 +48,9 @@ public class DebugDumpSnapshotOption extends UserActionAbstract {
@Override
public Consent disabled(final View component) {
- final Enumeration<Logger> enumeration = enumerationOver(Logger.getRootLogger().getAllAppenders(), Logger.class);
+ final Enumeration<Logger> enumeration = enumerationOver(org.apache.log4j.Logger.getRootLogger().getAllAppenders(), Logger.class);
while (enumeration.hasMoreElements()) {
- final Appender appender = (Appender) enumeration.nextElement();
+ final org.apache.log4j.Appender appender = (org.apache.log4j.Appender) enumeration.nextElement();
if (appender instanceof SnapshotAppender) {
return Allow.DEFAULT;
}
@@ -59,9 +61,9 @@ public class DebugDumpSnapshotOption extends UserActionAbstract {
@Override
public void execute(final Workspace workspace, final View view, final Location at) {
- final Enumeration<Logger> enumeration = enumerationOver(Logger.getRootLogger().getAllAppenders(), Logger.class);
+ final Enumeration<Logger> enumeration = enumerationOver(org.apache.log4j.Logger.getRootLogger().getAllAppenders(), Logger.class);
while (enumeration.hasMoreElements()) {
- final Appender appender = (Appender) enumeration.nextElement();
+ final org.apache.log4j.Appender appender = (org.apache.log4j.Appender) enumeration.nextElement();
if (appender instanceof SnapshotAppender) {
((SnapshotAppender) appender).forceSnapshot();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/debug/LoggingOptions.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/debug/LoggingOptions.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/debug/LoggingOptions.java
index 6ec4102..63178f5 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/debug/LoggingOptions.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/debug/LoggingOptions.java
@@ -19,9 +19,6 @@
package org.apache.isis.viewer.dnd.view.debug;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.ConsentAbstract;
import org.apache.isis.core.metamodel.spec.ActionType;
@@ -36,25 +33,25 @@ public class LoggingOptions implements MenuOptions {
@Override
public void menuOptions(final UserActionSet options) {
- options.add(loggingOption("Off", Level.OFF));
- options.add(loggingOption("Error", Level.ERROR));
- options.add(loggingOption("Warn", Level.WARN));
- options.add(loggingOption("Info", Level.INFO));
- options.add(loggingOption("Debug", Level.DEBUG));
+ options.add(loggingOption("Off", org.apache.log4j.Level.OFF));
+ options.add(loggingOption("Error", org.apache.log4j.Level.ERROR));
+ options.add(loggingOption("Warn", org.apache.log4j.Level.WARN));
+ options.add(loggingOption("Info", org.apache.log4j.Level.INFO));
+ options.add(loggingOption("Debug", org.apache.log4j.Level.DEBUG));
options.add(new DebugDumpSnapshotOption());
}
- private UserActionAbstract loggingOption(final String name, final Level level) {
+ private UserActionAbstract loggingOption(final String name, final org.apache.log4j.Level level) {
return new UserActionAbstract("Log level " + level, ActionType.DEBUG) {
@Override
public Consent disabled(final View component) {
- return ConsentAbstract.allowIf(LogManager.getRootLogger().getLevel() != level);
+ return ConsentAbstract.allowIf(org.apache.log4j.LogManager.getRootLogger().getLevel() != level);
}
@Override
public void execute(final Workspace workspace, final View view, final Location at) {
- LogManager.getRootLogger().setLevel(level);
+ org.apache.log4j.LogManager.getRootLogger().setLevel(level);
}
};
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldElementImpl.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldElementImpl.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldElementImpl.java
index 5bab415..6e56e89 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldElementImpl.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldElementImpl.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.view.field;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -33,7 +34,7 @@ import org.apache.isis.viewer.dnd.view.UserActionSet;
import org.apache.isis.viewer.dnd.view.content.AbstractObjectContent;
public class OneToManyFieldElementImpl extends AbstractObjectContent implements OneToManyFieldElement {
- private static final Logger LOG = Logger.getLogger(OneToManyFieldElementImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(OneToManyFieldElementImpl.class);
private final ObjectAdapter element;
private final ObjectField field;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java
index b8d9a47..ab214ba 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java
@@ -22,7 +22,8 @@ package org.apache.isis.viewer.dnd.view.menu;
import java.awt.event.KeyEvent;
import java.util.Vector;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -234,7 +235,7 @@ public class PopupMenu extends AbstractView {
}
}
- private static final Logger LOG = Logger.getLogger(PopupMenu.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PopupMenu.class);
private Color backgroundColor;
private View forView;
private Item[] items = new Item[0];
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/option/OpenViewOption.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/option/OpenViewOption.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/option/OpenViewOption.java
index 2127720..c61f156 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/option/OpenViewOption.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/option/OpenViewOption.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.view.option;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.viewer.dnd.drawing.Location;
import org.apache.isis.viewer.dnd.view.Content;
@@ -31,7 +32,7 @@ import org.apache.isis.viewer.dnd.view.Workspace;
import org.apache.isis.viewer.dnd.view.content.FieldContent;
public class OpenViewOption extends UserActionAbstract {
- private static final Logger LOG = Logger.getLogger(OpenViewOption.class);
+ private static final Logger LOG = LoggerFactory.getLogger(OpenViewOption.class);
private final ViewSpecification specification;
public OpenViewOption(final ViewSpecification builder) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/option/ReplaceViewOption.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/option/ReplaceViewOption.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/option/ReplaceViewOption.java
index 6cdb8c3..fda4361 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/option/ReplaceViewOption.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/option/ReplaceViewOption.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.view.option;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.viewer.dnd.drawing.Location;
import org.apache.isis.viewer.dnd.view.Axes;
@@ -28,7 +29,7 @@ import org.apache.isis.viewer.dnd.view.ViewSpecification;
import org.apache.isis.viewer.dnd.view.Workspace;
public class ReplaceViewOption extends UserActionAbstract {
- private static final Logger LOG = Logger.getLogger(ReplaceViewOption.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ReplaceViewOption.class);
private final ViewSpecification specification;
public ReplaceViewOption(final ViewSpecification specification) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/text/TextBlock.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/text/TextBlock.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/text/TextBlock.java
index 5747882..05b20e9 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/text/TextBlock.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/text/TextBlock.java
@@ -19,11 +19,12 @@
package org.apache.isis.viewer.dnd.view.text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class TextBlock {
- private static final Logger LOG = Logger.getLogger(TextBlock.class);
- private static final Logger UI_LOG = Logger.getLogger("ui." + TextBlock.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(TextBlock.class);
+ private static final Logger UI_LOG = LoggerFactory.getLogger("ui." + TextBlock.class.getName());
private final TextBlockTarget forField;
private String text;
private int[] lineBreaks;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/text/TextContent.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/text/TextContent.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/text/TextContent.java
index 97bf245..bfdcd1e 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/text/TextContent.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/text/TextContent.java
@@ -22,7 +22,8 @@ package org.apache.isis.viewer.dnd.view.text;
import java.util.Enumeration;
import java.util.Vector;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -30,8 +31,8 @@ import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.viewer.dnd.drawing.Location;
public class TextContent {
- private static final Logger LOG = Logger.getLogger(TextContent.class);
- private static final Logger UI_LOG = Logger.getLogger("ui." + TextContent.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(TextContent.class);
+ private static final Logger UI_LOG = LoggerFactory.getLogger("ui." + TextContent.class.getName());
public static final int NO_WRAPPING = 1;
public static final int WRAPPING = 0;
private final Vector blocks;