You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/12/13 15:31:56 UTC

[49/52] [abbrv] isis git commit: Code cleanup (no functional changes!):

Code cleanup (no functional changes!):

- remove implicit modifiers for interface methods and static inner classes
- Java 7 diamonds


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4e21fbc4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4e21fbc4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4e21fbc4

Branch: refs/heads/ISIS-1224-select2-v4
Commit: 4e21fbc45ea7e10162aad2d803801fc271c919ea
Parents: 94ccb54
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Dec 13 10:26:03 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Dec 13 10:26:03 2015 +0100

----------------------------------------------------------------------
 .../core/metamodel/facets/ContributeeMemberFacetFactory.java   | 3 +--
 .../core/metamodel/facets/object/parseable/ParseableFacet.java | 2 +-
 .../metamodel/facets/objectvalue/multiline/MultiLineFacet.java | 4 ++--
 .../apache/isis/core/metamodel/progmodel/ProgrammingModel.java | 6 +++---
 .../core/metamodel/specloader/specimpl/ContributeeMember.java  | 2 +-
 .../ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java | 3 ---
 .../wicket/ui/components/scalars/ScalarPanelAbstract.java      | 4 ++--
 .../scalars/ScalarPanelTextFieldParseableAbstract.java         | 2 +-
 8 files changed, 11 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/4e21fbc4/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ContributeeMemberFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ContributeeMemberFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ContributeeMemberFacetFactory.java
index 4bf6662..05a6719 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ContributeeMemberFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ContributeeMemberFacetFactory.java
@@ -26,7 +26,6 @@ import com.google.common.collect.Lists;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.lang.PropertiesExtensions;
-import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
@@ -38,7 +37,7 @@ import org.apache.isis.core.metamodel.specloader.specimpl.ContributeeMember;
  */
 public interface ContributeeMemberFacetFactory extends FacetFactory {
 
-    public static class ProcessContributeeMemberContext extends AbstractProcessContext<ObjectMember> 
+    class ProcessContributeeMemberContext extends AbstractProcessContext<ObjectMember>
             implements ProcessContextWithMetadataProperties<ObjectMember> {
         
         private final Properties metadataProperties;

http://git-wip-us.apache.org/repos/asf/isis/blob/4e21fbc4/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java
index 4e63686..8650427 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java
@@ -58,5 +58,5 @@ public interface ParseableFacet extends MultipleValueFacet {
      * field. So, a date might be rendered via a {@link TitleFacet} as
      * <tt>May 2, 2007</tt>, but its parseable form might be <tt>20070502</tt>.
      */
-    public String parseableTitle(ObjectAdapter obj);
+    String parseableTitle(ObjectAdapter obj);
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/4e21fbc4/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/multiline/MultiLineFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/multiline/MultiLineFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/multiline/MultiLineFacet.java
index 2678ed5..c78d044 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/multiline/MultiLineFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/multiline/MultiLineFacet.java
@@ -34,7 +34,7 @@ public interface MultiLineFacet extends MultipleValueFacet {
     /**
      * How many lines to use.
      */
-    public int numberOfLines();
+    int numberOfLines();
 
     /**
      * Whether carriage returns should be used to split over multiple lines or
@@ -46,6 +46,6 @@ public interface MultiLineFacet extends MultipleValueFacet {
      * spills over the length of one line.
      */
     @Deprecated
-    public boolean preventWrapping();
+    boolean preventWrapping();
 
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/4e21fbc4/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModel.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModel.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModel.java
index 590b779..44999b9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModel.java
@@ -50,7 +50,7 @@ public interface ProgrammingModel extends MetaModelValidatorRefiner {
      *
      * @see #FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST
      */
-    public static final String FACET_FACTORY_INCLUDE_CLASS_NAME_LIST = ConfigurationConstants.ROOT + "reflector.facets.include";
+    String FACET_FACTORY_INCLUDE_CLASS_NAME_LIST = ConfigurationConstants.ROOT + "reflector.facets.include";
 
     /**
      * Key used to lookup comma-separated list of {@link FacetFactory}s to
@@ -58,13 +58,13 @@ public interface ProgrammingModel extends MetaModelValidatorRefiner {
      *
      * @see #FACET_FACTORY_INCLUDE_CLASS_NAME_LIST
      */
-    public static final String FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST = ConfigurationConstants.ROOT + "reflector.facets.exclude";
+    String FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST = ConfigurationConstants.ROOT + "reflector.facets.exclude";
 
     /**
      * This is a bit nasty, but currently the bootstrapping of the metamodel for integration tests vs the webapp differs;
      * the intent of this class is to centralize some logic that should be applied in both cases.
      */
-    public static class Util {
+    class Util {
         private Util(){}
 
         public static void includeFacetFactories(final IsisConfiguration configuration, final ProgrammingModel programmingModel) {

http://git-wip-us.apache.org/repos/asf/isis/blob/4e21fbc4/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ContributeeMember.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ContributeeMember.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ContributeeMember.java
index 9aca015..a9cf21b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ContributeeMember.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ContributeeMember.java
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
 public interface ContributeeMember extends ObjectMember {
 
 
-    public static class Predicates {
+    class Predicates {
         
         private Predicates(){}
 

http://git-wip-us.apache.org/repos/asf/isis/blob/4e21fbc4/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
----------------------------------------------------------------------
diff --git a/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index db4e793..37035f4 100644
--- a/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -19,12 +19,9 @@
 package org.apache.isis.security.shiro;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
 import static org.junit.Assert.assertThat;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
 import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;

http://git-wip-us.apache.org/repos/asf/isis/blob/4e21fbc4/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index efa428e..a9df6fa 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -395,7 +395,7 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
 
     @Override
     public AdapterManager getAdapterManager() {
-    return getPersistenceSession();
-}
+        return getPersistenceSession();
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/4e21fbc4/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
index cda2568..103dcc8 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldParseableAbstract.java
@@ -48,7 +48,7 @@ public abstract class ScalarPanelTextFieldParseableAbstract extends ScalarPanelT
 
     @Override
     protected AbstractTextComponent<String> createTextFieldForRegular() {
-        final AbstractTextComponent<String> textField = new TextField<String>(idTextField, new Model<String>() {
+        final AbstractTextComponent<String> textField = new TextField<>(idTextField, new Model<String>() {
             private static final long serialVersionUID = 1L;
 
             @Override