svn commit: r1373632 [5/5] - in /incubator/isis/trunk/framework: core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/mgr/ core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ core/metamodel/src/main/java/org/apache/i...

[da...@apache.org]

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java?rev=1373632&r1=1373631&r2=1373632&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java Wed Aug 15 21:15:39 2012
@@ -22,17 +22,15 @@ package org.apache.isis.viewer.wicket.vi
 import java.util.Locale;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.wicket.util.convert.IConverter;
-
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
+import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
 import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
-import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi;
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
 import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
+import org.apache.wicket.util.convert.IConverter;
 
 /**
  * Implementation of a Wicket {@link IConverter} for
@@ -44,7 +42,7 @@ public class ConverterForObjectAdapterMe
     private static final long serialVersionUID = 1L;
 
     /**
-     * Converts {@link OidStringifier stringified} {@link Oid} to
+     * Converts string representation of {@link Oid} to
      * {@link ObjectAdapterMemento}.
      */
     @Override
@@ -52,14 +50,14 @@ public class ConverterForObjectAdapterMe
         if (StringUtils.isEmpty(value)) {
             return null;
         }
-        final Oid oid = getOidStringifier().deString(value);
+        final Oid oid = RootOidDefault.deStringEncoded(value);
         final ObjectAdapter adapter = getAdapterManager().getAdapterFor(oid);
         return ObjectAdapterMemento.createOrNull(adapter);
     }
 
     /**
-     * Converts {@link ObjectAdapterMemento} to {@link OidStringifier
-     * stringified} {@link RootOid}.
+     * Converts {@link ObjectAdapterMemento} to string representation of
+     * {@link RootOid}.
      */
     @Override
     public String convertToString(final Object object, final Locale locale) {
@@ -73,17 +71,14 @@ public class ConverterForObjectAdapterMe
             // REVIEW: is this right?
             return memento.toString();
         }
-        return getOidStringifier().enString((RootOid) oid);
+        RootOid rootOid = (RootOid) oid;
+        return rootOid.enString();
     }
 
     protected AdapterManager getAdapterManager() {
         return getPersistenceSession().getAdapterManager();
     }
 
-    protected OidStringifier getOidStringifier() {
-        return getPersistenceSession().getOidGenerator().getOidStringifier();
-    }
-
     protected PersistenceSession getPersistenceSession() {
         return IsisContext.getPersistenceSession();
     }