[41/50] [abbrv] isis git commit: ISIS-1194: removing getAdapterFor() from PersistenceSession (can return itself instead)

[da...@apache.org]

http://git-wip-us.apache.org/repos/asf/isis/blob/ecdb512e/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java
index 5c279e2..1827cf4 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java
@@ -22,11 +22,13 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.jdkdates;
 
 import java.sql.Timestamp;
 
-import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldDatePickerAbstract;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 
+import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
+import org.apache.isis.viewer.wicket.model.models.ScalarModel;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldDatePickerAbstract;
+
 /**
  * Panel for rendering scalars of type {@link java.sql.Timestamp}.
  */
@@ -48,4 +50,5 @@ public class JavaSqlTimestampPanel extends ScalarPanelTextFieldDatePickerAbstrac
     protected IModel<String> getScalarPanelType() {
         return Model.of("javaSqlTimestampPanel");
     }
+
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/ecdb512e/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
index b4c9087..7c0dcc5 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
@@ -127,7 +127,7 @@ public class BooleanPanel extends ScalarPanelAbstract {
 
             @Override
             public void setObject(final Boolean object) {
-                final ObjectAdapter adapter = getAdapterManager().adapterFor(object);
+                final ObjectAdapter adapter = getPersistenceSession().adapterFor(object);
                 getModel().setObject(adapter);
             }
         }) {
@@ -146,7 +146,7 @@ public class BooleanPanel extends ScalarPanelAbstract {
         final ObjectSpecification objectSpecification = getModel().getTypeOfSpecification();
         if(objectSpecification.getFullIdentifier().equals("boolean")) {
             if(getModel().getObject() == null) {
-                getModel().setObject(getAdapterManager().adapterFor(false));
+                getModel().setObject(getPersistenceSession().adapterFor(false));
             }
         }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/ecdb512e/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index 5026844..81b5a18 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -24,10 +24,10 @@ import org.apache.wicket.Session;
 import org.apache.wicket.markup.html.IHeaderContributor;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
+
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
 import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
 import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
 import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProviderAware;
@@ -149,11 +149,6 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel implement
         return IsisContext.getPersistenceSession();
     }
 
-    public AdapterManager getAdapterManager() {
-        return getPersistenceSession().getAdapterManager();
-    }
-
-
     // /////////////////////////////////////////////////
     // Dependency Injection
     // /////////////////////////////////////////////////