Author: julien_viet Date: 2009-09-13 14:24:06 -0400 (Sun, 13 Sep 2009) New Revision: 183 Removed: components/mop/trunk/api/src/main/java/org/gatein/mop/api/content/customization/ Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/content/Customization.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/content/portlet/Preference.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/content/portlet/Preferences.java Log: remove a bunch of features that should not be specified here but rather at the portal level (so reduce a bit the initial scope) Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/content/Customization.java =================================================================== --- components/mop/trunk/api/src/main/java/org/gatein/mop/api/content/Customization.java 2009-09-13 17:34:26 UTC (rev 182) +++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/content/Customization.java 2009-09-13 18:24:06 UTC (rev 183) @@ -18,8 +18,6 @@ */ package org.gatein.mop.api.content; -import org.gatein.mop.api.content.customization.CustomizationMode; - import java.util.Set; import java.util.Collection; @@ -85,7 +83,7 @@ * @param contexts the customization context * @return the customization */ - Customization<S> customize(CustomizationMode mode, Collection<CustomizationContext> contexts); + Customization<S> customize(Collection<CustomizationContext> contexts); /** * Returns the customization cascaded state. Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java 2009-09-13 17:34:26 UTC (rev 182) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java 2009-09-13 18:24:06 UTC (rev 183) @@ -21,7 +21,6 @@ import org.gatein.mop.api.content.Customization; import org.gatein.mop.api.content.CustomizationContext; import org.gatein.mop.api.content.ContentType; -import org.gatein.mop.api.content.customization.CustomizationMode; import org.gatein.mop.api.workspace.WorkspaceCustomizationContext; import org.gatein.mop.core.api.content.CustomizationContextComparator; import org.gatein.mop.core.api.content.ContentManagerRegistry; @@ -146,16 +145,10 @@ return get(contexts, false); } - public Customization<Object> customize(CustomizationMode mode, Collection<CustomizationContext> contexts) { - if (mode == null) { - throw new NullPointerException(); - } + public Customization<Object> customize(Collection<CustomizationContext> contexts) { if (contexts == null) { throw new NullPointerException(); } - if (mode == CustomizationMode.CLONE) { - throw new UnsupportedOperationException("todo : support cloning"); - } return get(contexts, true); } Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/content/portlet/Preference.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/content/portlet/Preference.java 2009-09-13 17:34:26 UTC (rev 182) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/content/portlet/Preference.java 2009-09-13 18:24:06 UTC (rev 183) @@ -101,7 +101,7 @@ } if (obj instanceof Preference) { Preference that = (Preference)obj; - return this.name.equals(that.name) && this.getValues().equals(that.getValues()) && this.readOnly == that.isReadOnly(); + return this.name.equals(that.name) && this.getValues().equals(that.getValues()); } return false; } Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/content/portlet/Preferences.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/content/portlet/Preferences.java 2009-09-13 17:34:26 UTC (rev 182) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/content/portlet/Preferences.java 2009-09-13 18:24:06 UTC (rev 183) @@ -86,7 +86,7 @@ } else { entry = new Preference(entry.getName(), value, entry.isReadOnly()); } - entries.put(name, entry); + state.put(name, entry); return this; } @@ -101,7 +101,7 @@ throw new IllegalStateException(); } entry = new Preference(entry.getName(), entry.getValues(), readOnly); - entries.put(name, entry); + state.put(name, entry); return this; } @@ -110,7 +110,7 @@ } public Preferences putPreference(Preference preference) { - entries.put(preference.getName(), preference); + state.put(preference.getName(), preference); return this; }