Switch from org.apache.log4j to org.slf4j.

gitlab #342

Change-Id: I764df2ecf1e58a1529c0a4e46653054ff15a2de7

diff --git a/bundles/org.simantics.objmap2/META-INF/MANIFEST.MF b/bundles/org.simantics.objmap2/META-INF/MANIFEST.MF
index 87e9bbfd5b032aba11aad36ebdcb9b07607cbbea..db84bf0c590ba30cc6a203dc614ddb4f151d07d8 100644 (file)
--- a/bundles/org.simantics.objmap2/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.objmap2/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Require-Bundle: org.simantics.db;bundle-version="1.1.0",
  gnu.trove3;bundle-version="3.0.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
  org.simantics.layer0;bundle-version="1.0.0",
  gnu.trove3;bundle-version="3.0.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
  org.simantics.layer0;bundle-version="1.0.0",

- org.apache.log4j;bundle-version="1.2.15",

  org.simantics.db.common;bundle-version="1.1.0",
  org.simantics.structural.ontology;bundle-version="1.1.0",
  org.slf4j.api
  org.simantics.db.common;bundle-version="1.1.0",
  org.simantics.structural.ontology;bundle-version="1.1.0",
  org.slf4j.api

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/annotations/factories/UpdateMethodFactory.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/annotations/factories/UpdateMethodFactory.java
index 10f64be78d5eef552a2c3a7f7fc69cb41894ceb6..b201176261496f98942dbd31edc9e1597db68cf1 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/annotations/factories/UpdateMethodFactory.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/annotations/factories/UpdateMethodFactory.java
@@ -14,7 +14,8 @@ package org.simantics.objmap.graph.annotations.factories;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 

-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.simantics.db.ReadGraph;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.exception.DatabaseException;


@@ -26,7 +27,7 @@ import org.simantics.objmap.graph.rules.factory.IMethodRuleFactory;
 
 public class UpdateMethodFactory<Domain, Range> implements IMethodRuleFactory<Domain, Range> {
 
 
 public class UpdateMethodFactory<Domain, Range> implements IMethodRuleFactory<Domain, Range> {
 

-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static Logger LOGGER = LoggerFactory.getLogger(UpdateMethodFactory.class);

     
     @Override
     public IBidirectionalMappingRule<Domain, Range> create(ReadGraph g, 
     
     @Override
     public IBidirectionalMappingRule<Domain, Range> create(ReadGraph g, 

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/impl/Mapping.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/impl/Mapping.java
index f105a2894c42866f6ccca0cf6d8650c2dc36b406..9f048f7752b1a900a1730eae5242d53519d21a8b 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/impl/Mapping.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/impl/Mapping.java
@@ -21,7 +21,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
 import java.util.List;
 import java.util.Set;
 

-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.simantics.db.ReadGraph;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.exception.DatabaseException;


@@ -42,7 +43,7 @@ import org.simantics.objmap.graph.schema.IMappingSchema;
  */
 public class Mapping<Domain, Range> implements IMapping<Domain, Range> {
 
  */
 public class Mapping<Domain, Range> implements IMapping<Domain, Range> {
 

-       static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+       static final Logger LOGGER = LoggerFactory.getLogger(Mapping.class);

        
        
        IMappingSchema<Domain, Range> schema;
        
        
        IMappingSchema<Domain, Range> schema;

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/MappedElementRule.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/MappedElementRule.java
index 3b6fac31d4299f9d75efb5d41a2f2391aa137b75..5e4eec39feb51cc768c15d31de1bc8633ba706b2 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/MappedElementRule.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/MappedElementRule.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.simantics.objmap.graph.rules;
 
  *******************************************************************************/
 package org.simantics.objmap.graph.rules;
 

-import org.apache.log4j.Logger;

 import org.simantics.db.ReadGraph;
 import org.simantics.db.WriteGraph;
 import org.simantics.objmap.backward.IBackwardMapping;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.WriteGraph;
 import org.simantics.objmap.backward.IBackwardMapping;


@@ -20,9 +19,8 @@ import org.simantics.objmap.exceptions.MappingException;
 import org.simantics.objmap.forward.IForwardMapping;
 import org.simantics.objmap.graph.rules.domain.IDomainAccessor;
 import org.simantics.objmap.graph.rules.range.IRangeAccessor;
 import org.simantics.objmap.forward.IForwardMapping;
 import org.simantics.objmap.graph.rules.domain.IDomainAccessor;
 import org.simantics.objmap.graph.rules.range.IRangeAccessor;

-
-
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 
 /**
  * A rule that synchronizes collection of elements between
 
 /**
  * A rule that synchronizes collection of elements between


@@ -32,7 +30,7 @@ import org.simantics.objmap.graph.rules.range.IRangeAccessor;
  */
 public class MappedElementRule<Domain, Range> implements IBidirectionalMappingRule<Domain, Range> {
     
  */
 public class MappedElementRule<Domain, Range> implements IBidirectionalMappingRule<Domain, Range> {
     

-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static final Logger LOGGER = LoggerFactory.getLogger(MappedElementRule.class);

     
        IDomainAccessor<Domain,Domain> domainAccessor;
        IRangeAccessor<Range,Range> rangeAccessor;
     
        IDomainAccessor<Domain,Domain> domainAccessor;
        IRangeAccessor<Range,Range> rangeAccessor;

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/MappedElementsRule.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/MappedElementsRule.java
index cd295e583d426b08f5fd9d163bf6b0f9c17b6564..43a8ff49325fc46436954243092c5a22e391998b 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/MappedElementsRule.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/MappedElementsRule.java
@@ -14,7 +14,6 @@ package org.simantics.objmap.graph.rules;
 import java.util.ArrayList;
 import java.util.Collection;
 
 import java.util.ArrayList;
 import java.util.Collection;
 

-import org.apache.log4j.Logger;

 import org.simantics.db.ReadGraph;
 import org.simantics.db.WriteGraph;
 import org.simantics.objmap.backward.IBackwardMapping;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.WriteGraph;
 import org.simantics.objmap.backward.IBackwardMapping;


@@ -23,6 +22,8 @@ import org.simantics.objmap.exceptions.MappingException;
 import org.simantics.objmap.forward.IForwardMapping;
 import org.simantics.objmap.graph.rules.domain.IDomainAccessor;
 import org.simantics.objmap.graph.rules.range.IRangeAccessor;
 import org.simantics.objmap.forward.IForwardMapping;
 import org.simantics.objmap.graph.rules.domain.IDomainAccessor;
 import org.simantics.objmap.graph.rules.range.IRangeAccessor;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 
 
 /**
 
 
 /**


@@ -33,7 +34,7 @@ import org.simantics.objmap.graph.rules.range.IRangeAccessor;
  */
 public class MappedElementsRule<Domain, Range> implements IBidirectionalMappingRule<Domain, Range> {
 
  */
 public class MappedElementsRule<Domain, Range> implements IBidirectionalMappingRule<Domain, Range> {
 

-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static final Logger LOGGER = LoggerFactory.getLogger(MappedElementsRule.class);

 
     IDomainAccessor<Domain,Collection<Domain>> domainAccessor;
     IRangeAccessor<Range,Collection<Range>> rangeAccessor;
 
     IDomainAccessor<Domain,Collection<Domain>> domainAccessor;
     IRangeAccessor<Range,Collection<Range>> rangeAccessor;

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/ValueRule.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/ValueRule.java
index 718bc7c2d780ec46ded879a5416cf37d6051a7a1..d40c44f2b3287975c1d9c12a2e791048a83be1d7 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/ValueRule.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/ValueRule.java
@@ -11,7 +11,8 @@
  *******************************************************************************/
 package org.simantics.objmap.graph.rules;
 
  *******************************************************************************/
 package org.simantics.objmap.graph.rules;
 

-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.simantics.db.ReadGraph;
 import org.simantics.db.WriteGraph;
 import org.simantics.objmap.backward.IBackwardMapping;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.WriteGraph;
 import org.simantics.objmap.backward.IBackwardMapping;


@@ -29,7 +30,7 @@ import org.simantics.objmap.graph.rules.range.IRangeAccessor;
  */
 public class ValueRule<Domain, Range> implements IBidirectionalMappingRule<Domain, Range> {
     
  */
 public class ValueRule<Domain, Range> implements IBidirectionalMappingRule<Domain, Range> {
     

-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static Logger LOGGER = LoggerFactory.getLogger(ValueRule.class);

     
        IDomainAccessor<Domain,Object> domainAccessor;
        IRangeAccessor<Range,Object> rangeAccessor;
     
        IDomainAccessor<Domain,Object> domainAccessor;
        IRangeAccessor<Range,Object> rangeAccessor;

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/CompoundValueAccessor.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/CompoundValueAccessor.java
index 78b48430310356fd0c4f0561aaefb0736f8f907d..1c7e267c7d869d80cc6d89743b0683c015cd5468 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/CompoundValueAccessor.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/CompoundValueAccessor.java
@@ -16,7 +16,6 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
 import java.util.HashMap;
 import java.util.Map;
 

-import org.apache.log4j.Logger;

 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.Statement;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.Statement;


@@ -25,6 +24,8 @@ import org.simantics.db.exception.DatabaseException;
 import org.simantics.layer0.Layer0;
 import org.simantics.objmap.exceptions.MappingException;
 import org.simantics.objmap.graph.annotations.factories.CompoundRelatedGetSetValueRuleFactory;
 import org.simantics.layer0.Layer0;
 import org.simantics.objmap.exceptions.MappingException;
 import org.simantics.objmap.graph.annotations.factories.CompoundRelatedGetSetValueRuleFactory;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 
 /**
  * 
 
 /**
  * 


@@ -32,7 +33,7 @@ import org.simantics.objmap.graph.annotations.factories.CompoundRelatedGetSetVal
  */
 public class CompoundValueAccessor implements IDomainAccessor<Resource,Object> {
 
  */
 public class CompoundValueAccessor implements IDomainAccessor<Resource,Object> {
 

-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static final Logger LOGGER = LoggerFactory.getLogger(CompoundValueAccessor.class);

     
        Resource objRelation;
        Resource objType;
     
        Resource objRelation;
        Resource objType;

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/MappingUtils.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/MappingUtils.java
index a0d0d4dac2df176cc881fb9759f4173a911a1db1..dbda44e34f837578692e70d2906b4bf304ed86ba 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/MappingUtils.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/MappingUtils.java
@@ -14,7 +14,8 @@ package org.simantics.objmap.graph.rules.domain;
 import java.util.Arrays;
 import java.util.Collection;
 
 import java.util.Arrays;
 import java.util.Collection;
 

-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.exception.DatabaseException;


@@ -25,7 +26,7 @@ import org.simantics.db.exception.DatabaseException;
  */
 public class MappingUtils {
 
  */
 public class MappingUtils {
 

-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static final Logger LOGGER = LoggerFactory.getLogger(MappingUtils.class);

     
     /**
      * Adds and removes statements to/from the database so that <code>objects</code>
     
     /**
      * Adds and removes statements to/from the database so that <code>objects</code>

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/RelatedObjectAccessor.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/RelatedObjectAccessor.java
index 99253790cf0e0f0611eadcf06c9f297189882892..2cfc98185f5b3cd842255363c8a17e71f5bf3b07 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/RelatedObjectAccessor.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/RelatedObjectAccessor.java
@@ -11,7 +11,8 @@
  *******************************************************************************/
 package org.simantics.objmap.graph.rules.domain;
 
  *******************************************************************************/
 package org.simantics.objmap.graph.rules.domain;
 

-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;


@@ -24,7 +25,7 @@ import org.simantics.objmap.exceptions.MappingException;
  */
 public class RelatedObjectAccessor implements IDomainAccessor<Resource,Resource> {
 
  */
 public class RelatedObjectAccessor implements IDomainAccessor<Resource,Resource> {
 

-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static Logger LOGGER = LoggerFactory.getLogger(RelatedObjectAccessor.class);

     
        Resource relation;
        
     
        Resource relation;
        

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/RelatedObjectsAccessor.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/RelatedObjectsAccessor.java
index 9653ab370c28f5dc058b6be7e09edd6074c02743..d8002d976022398ff7196fbd43606c26d79ba257 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/RelatedObjectsAccessor.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/RelatedObjectsAccessor.java
@@ -13,7 +13,8 @@ package org.simantics.objmap.graph.rules.domain;
 
 import java.util.Collection;
 
 
 import java.util.Collection;
 

-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;


@@ -26,7 +27,7 @@ import org.simantics.objmap.exceptions.MappingException;
  */
 public class RelatedObjectsAccessor implements IDomainAccessor<Resource,Collection<Resource>> {
 
  */
 public class RelatedObjectsAccessor implements IDomainAccessor<Resource,Collection<Resource>> {
 

-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static Logger LOGGER = LoggerFactory.getLogger(RelatedObjectsAccessor.class);

     
        Resource relation;
        boolean deleteExtraObjects;
     
        Resource relation;
        boolean deleteExtraObjects;

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/RelatedOrderedSetElementsAccessor.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/RelatedOrderedSetElementsAccessor.java
index c033751e506eb7797e92918257520b8463203d6d..a272b4f0bc4dd0786688d6ff25719089ee1545f0 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/RelatedOrderedSetElementsAccessor.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/RelatedOrderedSetElementsAccessor.java
@@ -13,7 +13,8 @@ package org.simantics.objmap.graph.rules.domain;
 
 import java.util.Collection;
 
 
 import java.util.Collection;
 

-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;


@@ -27,7 +28,7 @@ import org.simantics.objmap.exceptions.MappingException;
  */
 public class RelatedOrderedSetElementsAccessor implements IDomainAccessor<Resource, Collection<Resource>> {
 
  */
 public class RelatedOrderedSetElementsAccessor implements IDomainAccessor<Resource, Collection<Resource>> {
 

-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static Logger LOGGER = LoggerFactory.getLogger(RelatedOrderedSetElementsAccessor.class);

     
        boolean deleteExtraObjects;
 
     
        boolean deleteExtraObjects;
 

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/RelatedValueAccessor.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/RelatedValueAccessor.java
index d5ad40b77cd8f82f2369978872c7e967e24aac7d..9ede881774873f5c8ba6feabe8bcec4a13f878fc 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/RelatedValueAccessor.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/domain/RelatedValueAccessor.java
@@ -13,7 +13,8 @@ package org.simantics.objmap.graph.rules.domain;
 
 import java.util.Arrays;
 
 
 import java.util.Arrays;
 

-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.Statement;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.Statement;


@@ -28,7 +29,7 @@ import org.simantics.objmap.exceptions.MappingException;
  */
 public class RelatedValueAccessor implements IDomainAccessor<Resource,Object> {
 
  */
 public class RelatedValueAccessor implements IDomainAccessor<Resource,Object> {
 

-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static Logger LOGGER = LoggerFactory.getLogger(RelatedValueAccessor.class);

     
        Resource relation;
        Resource valueType;
     
        Resource relation;
        Resource valueType;

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/range/FieldAccessor.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/range/FieldAccessor.java
index 6615e94fb41edf507f55e646cbb9b539bca679c0..278c35a89503a32798b22b6fd31054836d385f98 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/range/FieldAccessor.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/rules/range/FieldAccessor.java
@@ -13,8 +13,9 @@ package org.simantics.objmap.graph.rules.range;
 
 import java.lang.reflect.Field;
 
 
 import java.lang.reflect.Field;
 

-import org.apache.log4j.Logger;

 import org.simantics.objmap.exceptions.MappingException;
 import org.simantics.objmap.exceptions.MappingException;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 
 
 /**
 
 
 /**


@@ -23,7 +24,7 @@ import org.simantics.objmap.exceptions.MappingException;
  */
 public class FieldAccessor<Range,T> implements IRangeAccessor<Range,T> {
     
  */
 public class FieldAccessor<Range,T> implements IRangeAccessor<Range,T> {
     

-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static final Logger LOGGER = LoggerFactory.getLogger(FieldAccessor.class);

     
        Field field;
 
     
        Field field;
 

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/schema/AdaptedLinkType.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/schema/AdaptedLinkType.java
index 046a744cf4d332cac824bd03b2429ad959d20fc7..9b02d5d50c9bec9d4bcb77ed9a1277fd6c015267 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/schema/AdaptedLinkType.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/schema/AdaptedLinkType.java
@@ -11,7 +11,7 @@
  *******************************************************************************/
 package org.simantics.objmap.graph.schema;
 
  *******************************************************************************/
 package org.simantics.objmap.graph.schema;
 

-//import org.apache.log4j.Logger;
+//import org.slf4j.Logger;

 import org.eclipse.core.runtime.IAdaptable;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.eclipse.core.runtime.IAdaptable;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/schema/SimpleLinkType.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/schema/SimpleLinkType.java
index fcfb3b012a802439398bc6d020325e9875494f38..1de0e31fab355321e8fd84f06d6822dc17778216 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/schema/SimpleLinkType.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/graph/schema/SimpleLinkType.java
@@ -13,7 +13,8 @@ package org.simantics.objmap.graph.schema;
 
 import java.util.ArrayList;
 
 
 import java.util.ArrayList;
 

-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;


@@ -34,7 +35,7 @@ import org.simantics.objmap.forward.IForwardMapping;
  */
 public class SimpleLinkType<Range> implements ILinkType<Resource,Range> {
     
  */
 public class SimpleLinkType<Range> implements ILinkType<Resource,Range> {
     

-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static Logger LOGGER = LoggerFactory.getLogger(SimpleLinkType.class);

     
     public Resource domainType;
     public Class<?> rangeType;
     
     public Resource domainType;
     public Class<?> rangeType;

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/annotations/factories/UpdateMethodFactory.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/annotations/factories/UpdateMethodFactory.java
index a5dc78f9120196e76dca9432ad3514f7d0799085..1ce1ef1c61e9f74dc91e449d961f6185bda98d13 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/annotations/factories/UpdateMethodFactory.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/annotations/factories/UpdateMethodFactory.java
@@ -14,7 +14,8 @@ package org.simantics.objmap.structural.annotations.factories;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 

-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.simantics.db.ReadGraph;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.exception.DatabaseException;


@@ -26,7 +27,7 @@ import org.simantics.objmap.graph.rules.factory.IMethodRuleFactory;
 
 public class UpdateMethodFactory<Domain, Range> implements IMethodRuleFactory<Domain, Range> {
 
 
 public class UpdateMethodFactory<Domain, Range> implements IMethodRuleFactory<Domain, Range> {
 

-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static Logger LOGGER = LoggerFactory.getLogger(UpdateMethodFactory.class);

     
     @Override
     public IBidirectionalMappingRule<Domain, Range> create(ReadGraph g, 
     
     @Override
     public IBidirectionalMappingRule<Domain, Range> create(ReadGraph g, 

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/RelatedObjectAccessor.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/RelatedObjectAccessor.java
index 295e60e2f29796eb96ea7ce88a90c2610018efd0..736f86b39c2a889b9962d8dd8334e809d8426ea8 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/RelatedObjectAccessor.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/RelatedObjectAccessor.java
@@ -11,7 +11,8 @@
  *******************************************************************************/
 package org.simantics.objmap.structural.rules.domain;
 
  *******************************************************************************/
 package org.simantics.objmap.structural.rules.domain;
 

-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;


@@ -23,7 +24,7 @@ import org.simantics.objmap.structural.StructuralResource;
 
 public class RelatedObjectAccessor implements IDomainAccessor<StructuralResource,StructuralResource> {
 
 
 public class RelatedObjectAccessor implements IDomainAccessor<StructuralResource,StructuralResource> {
 

-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static Logger LOGGER = LoggerFactory.getLogger(RelatedObjectAccessor.class);

     
        Resource relation;
        boolean useTypeResource;
     
        Resource relation;
        boolean useTypeResource;

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/RelatedObjectsAccessor.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/RelatedObjectsAccessor.java
index cbd4ef3b40c9e5f1fae6b5e0159eb98e3f2e68cd..1e1be5b76df10f81935f760dc5cd48cf4b21593e 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/RelatedObjectsAccessor.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/RelatedObjectsAccessor.java
@@ -16,7 +16,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
 import java.util.Collections;
 import java.util.List;
 

-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;


@@ -29,7 +30,7 @@ import org.simantics.objmap.structural.StructuralResource;
 
 public class RelatedObjectsAccessor implements IDomainAccessor<StructuralResource,Collection<StructuralResource>> {
 
 
 public class RelatedObjectsAccessor implements IDomainAccessor<StructuralResource,Collection<StructuralResource>> {
 

-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static Logger LOGGER = LoggerFactory.getLogger(RelatedObjectsAccessor.class);

     
        Resource relation;
        boolean deleteExtraObjects;
     
        Resource relation;
        boolean deleteExtraObjects;

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/RelatedOrderedSetElementsAccessor.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/RelatedOrderedSetElementsAccessor.java
index 6c1ed3aa2777038fbfa958ee7735c7c3441313ac..97fde226f2fa522ac8ca472b94146db55feca996 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/RelatedOrderedSetElementsAccessor.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/RelatedOrderedSetElementsAccessor.java
@@ -16,7 +16,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
 import java.util.Collections;
 import java.util.List;
 

-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;


@@ -28,7 +29,7 @@ import org.simantics.objmap.structural.StructuralResource;
 
 public class RelatedOrderedSetElementsAccessor implements IDomainAccessor<StructuralResource, Collection<StructuralResource>> {
 
 
 public class RelatedOrderedSetElementsAccessor implements IDomainAccessor<StructuralResource, Collection<StructuralResource>> {
 

-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static Logger LOGGER = LoggerFactory.getLogger(RelatedOrderedSetElementsAccessor.class);

     
        boolean deleteExtraObjects;
        boolean useTypeResource;
     
        boolean deleteExtraObjects;
        boolean useTypeResource;

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/RelatedValueAccessor.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/RelatedValueAccessor.java
index 2d3a24230e88c3b6d0edd51377c75c52f1fc0903..41279d1aba8fede41e5bde9fa42b9eeeb33a9c04 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/RelatedValueAccessor.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/RelatedValueAccessor.java
@@ -13,7 +13,8 @@ package org.simantics.objmap.structural.rules.domain;
 
 import java.util.Arrays;
 
 
 import java.util.Arrays;
 

-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.Statement;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.Statement;


@@ -27,7 +28,7 @@ import org.simantics.objmap.structural.StructuralResource;
 
 public class RelatedValueAccessor implements IDomainAccessor<StructuralResource,Object> {
 
 
 public class RelatedValueAccessor implements IDomainAccessor<StructuralResource,Object> {
 

-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static Logger LOGGER = LoggerFactory.getLogger(RelatedValueAccessor.class);

     
        Resource relation;
        Resource valueType;
     
        Resource relation;
        Resource valueType;

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/StructuralRelatedObjectAccessor.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/StructuralRelatedObjectAccessor.java
index 32b8fd38ce0125b44b946ea29a75ce7d4c7ef75c..865d4249ea78553645dbed7296bc9e4bc0ac8664 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/StructuralRelatedObjectAccessor.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/StructuralRelatedObjectAccessor.java
@@ -14,7 +14,8 @@ package org.simantics.objmap.structural.rules.domain;
 import java.util.ArrayList;
 import java.util.List;
 
 import java.util.ArrayList;
 import java.util.List;
 

-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;


@@ -26,7 +27,7 @@ import org.simantics.objmap.structural.StructuralResource;
 
 public class StructuralRelatedObjectAccessor implements IDomainAccessor<StructuralResource,StructuralResource> {
 
 
 public class StructuralRelatedObjectAccessor implements IDomainAccessor<StructuralResource,StructuralResource> {
 

-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static Logger LOGGER = LoggerFactory.getLogger(StructuralRelatedObjectAccessor.class);

     
        Resource relation;
        boolean useTypeResource;
     
        Resource relation;
        boolean useTypeResource;

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/StructuralRelatedObjectsAccessor.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/StructuralRelatedObjectsAccessor.java
index 730edc2696cec373b64643d8c8e632634073ec4e..6984bdcd02269a556eaef001f210d7be4268db96 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/StructuralRelatedObjectsAccessor.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/rules/domain/StructuralRelatedObjectsAccessor.java
@@ -16,7 +16,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
 import java.util.Collections;
 import java.util.List;
 

-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;


@@ -29,7 +30,7 @@ import org.simantics.objmap.structural.StructuralResource;
 
 public class StructuralRelatedObjectsAccessor implements IDomainAccessor<StructuralResource,Collection<StructuralResource>> {
 
 
 public class StructuralRelatedObjectsAccessor implements IDomainAccessor<StructuralResource,Collection<StructuralResource>> {
 

-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static Logger LOGGER = LoggerFactory.getLogger(StructuralRelatedObjectsAccessor.class);

     
        Resource relation;
        boolean deleteExtraObjects;
     
        Resource relation;
        boolean deleteExtraObjects;

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/schema/AdaptedLinkType.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/schema/AdaptedLinkType.java
index 4f55084861ef9413a548a9a6181b1ec9608893de..203863a6c74c61606d26e71d9c9dabf5964d675f 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/schema/AdaptedLinkType.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/schema/AdaptedLinkType.java
@@ -11,7 +11,7 @@
  *******************************************************************************/
 package org.simantics.objmap.structural.schema;
 
  *******************************************************************************/
 package org.simantics.objmap.structural.schema;
 

-//import org.apache.log4j.Logger;
+//import org.slf4j.Logger;

 import org.eclipse.core.runtime.IAdaptable;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.eclipse.core.runtime.IAdaptable;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;

diff --git a/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/schema/SimpleLinkType.java b/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/schema/SimpleLinkType.java
index 8a7091fd46e828ff2774df30265d7ff719bee8e4..ded0f40db8c15e3e1e4e0daad19e82344ac331f3 100644 (file)
--- a/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/schema/SimpleLinkType.java
+++ b/bundles/org.simantics.objmap2/src/org/simantics/objmap/structural/schema/SimpleLinkType.java
@@ -15,7 +15,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import java.util.Collections;
 import java.util.List;
 

-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;


@@ -34,7 +35,7 @@ import org.simantics.objmap.structural.StructuralResource;
 
 public class SimpleLinkType implements ILinkType<StructuralResource,IStructuralObject> {
     
 
 public class SimpleLinkType implements ILinkType<StructuralResource,IStructuralObject> {
     

-    static Logger LOGGER = Logger.getLogger("org.simantics.objmap");
+    static Logger LOGGER = LoggerFactory.getLogger(SimpleLinkType.class);

     
     public Resource domainType;
     public Class<?> rangeType;
     
     public Resource domainType;
     public Class<?> rangeType;