diff --git a/ccm-cms/.classpath b/ccm-cms/.classpath index 7f7bbdf95..fdb7e4ff2 100755 --- a/ccm-cms/.classpath +++ b/ccm-cms/.classpath @@ -6,5 +6,6 @@ + diff --git a/ccm-cms/.project b/ccm-cms/.project index a745b464f..320e756dc 100755 --- a/ccm-cms/.project +++ b/ccm-cms/.project @@ -3,8 +3,34 @@ ccm-cms + ccm-cms-assets-fileattachment + ccm-cms-types-article + ccm-cms-types-event + ccm-cms-types-filestorageitem + ccm-cms-types-mparticle + ccm-cms-types-newsitem + ccm-cms-types-siteproxy + ccm-core + ccm-forum + ccm-ldn-aplaws + ccm-ldn-atoz + ccm-ldn-dublin + ccm-ldn-navigation + ccm-ldn-portal + ccm-ldn-rss + ccm-ldn-search + ccm-ldn-shortcuts + ccm-ldn-subsite + ccm-ldn-terms + ccm-ldn-theme + ccm-ldn-util + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder @@ -13,5 +39,6 @@ org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature diff --git a/ccm-cms/.settings/org.eclipse.jdt.core.prefs b/ccm-cms/.settings/org.eclipse.jdt.core.prefs index ba3447885..bd9ef2817 100755 --- a/ccm-cms/.settings/org.eclipse.jdt.core.prefs +++ b/ccm-cms/.settings/org.eclipse.jdt.core.prefs @@ -1,22 +1,25 @@ -#Fri May 04 16:16:11 CEST 2007 +#Tue Jul 20 17:23:53 CEST 2010 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning @@ -24,39 +27,48 @@ org.eclipse.jdt.core.compiler.problem.forbiddenReference=error org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning org.eclipse.jdt.core.compiler.problem.nullReference=ignore org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled org.eclipse.jdt.core.compiler.problem.unusedImport=ignore org.eclipse.jdt.core.compiler.problem.unusedLabel=ignore org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.4 +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitAddChildForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitChildAddForm.java similarity index 91% rename from ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitAddChildForm.java rename to ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitChildAddForm.java index 897fceb5c..b36e9301c 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitAddChildForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitChildAddForm.java @@ -21,14 +21,14 @@ import org.apache.log4j.Logger; public class GenericOrganizationalUnitAddChildForm extends BasicItemForm { private static final Logger s_log = Logger.getLogger( - GenericOrganizationalUnitAddChildForm.class); + GenericOrganizationalUnitChildAddForm.class); private GenericOrganizationalUnitChildrenPropertiesStep m_step; - private ItemSearchWidget m_itemSearch; + private ItemSearchWidget m_itemSGenericOrganizationalUnitAddChildFormearch; private SaveCancelSection m_saveCancelSection; private final String ITEM_SEARCH = "orgaunitChild"; private ItemSelectionModel m_itemModel; - public GenericOrganizationalUnitAddChildForm(ItemSelectionModel itemModel) { + public GenericOrganizationalUnitChildAddForm(ItemSelectionModel itemModel) { super("ChildAddForm", itemModel); } diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitChildrenPropertiesStep.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitChildrenPropertiesStep.java index 53f550d9d..59746d235 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitChildrenPropertiesStep.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitChildrenPropertiesStep.java @@ -27,7 +27,7 @@ public class GenericOrganizationalUnitChildrenPropertiesStep extends SimpleEditS String prefix) { super(itemModel, parent, prefix); - BasicItemForm addChildSheet = new GenericOrganizationalUnitAddChildForm( + BasicItemForm addChildSheet = new GenericOrganizationalUnitChildAddForm( itemModel); add(ADD_CHILD_SHEET_NAME, (String) ContenttypesGlobalizationUtil.globalize( diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitAddPersonForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java similarity index 91% rename from ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitAddPersonForm.java rename to ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java index 39e7c18b4..5faa620ed 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitAddPersonForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java @@ -21,19 +21,19 @@ import org.apache.log4j.Logger; /** * - * @author jensp + * @author Jens Pelzetter */ -public class GenericOrganizationalUnitAddPersonForm extends BasicItemForm { +public class GenericOrganizationalUnitPersonAddForm extends BasicItemForm { private static final Logger s_log = Logger.getLogger( - GenericOrganizationalUnitAddPersonForm.class); + GenericOrganizationalUnitPersonAddForm.class); private GenericOrganizationalUnitPersonPropertiesStep m_step; private ItemSearchWidget m_itemSearch; private SaveCancelSection m_saveCancelSection; private final String ITEM_SEARCH = "orgaunitPerson"; private ItemSelectionModel m_itemModel; - public GenericOrganizationalUnitAddPersonForm(ItemSelectionModel itemModel) { + public GenericOrganizationalUnitPersonAddForm(ItemSelectionModel itemModel) { super("PersonAddForm", itemModel); } diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonPropertiesStep.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonPropertiesStep.java index ccf9a1bdb..1d2edcbec 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonPropertiesStep.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonPropertiesStep.java @@ -27,7 +27,7 @@ public class GenericOrganizationalUnitPersonPropertiesStep extends SimpleEditSte String prefix) { super(itemModel, parent, prefix); - BasicItemForm addPersonSheet = new GenericOrganizationalUnitAddPersonForm(itemModel); + BasicItemForm addPersonSheet = new GenericOrganizationalUnitPersonAddForm(itemModel); add(ADD_PERSON_SHEET_NAME, (String) ContenttypesGlobalizationUtil.globalize( "cms.contenttypes.ui.genericorgaunit.add_person").localize(), diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPropertyForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPropertyForm.java index 9e3a5bb9b..ee507f984 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPropertyForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPropertyForm.java @@ -23,7 +23,7 @@ import org.apache.log4j.Logger; /** * - * @author jensp + * @author Jens Pelzetter */ public class GenericOrganizationalUnitPropertyForm extends BasicPageForm implements FormProcessListener, FormInitListener, FormSubmissionListener { @@ -61,6 +61,7 @@ public class GenericOrganizationalUnitPropertyForm extends BasicPageForm ParameterModel addendumParam = new StringParameter(ADDENDUM); TextField addendum = new TextField(addendumParam); add(addendum); + } @Override diff --git a/ccm-core/.classpath b/ccm-core/.classpath index 6086dac25..e0b586bdb 100755 --- a/ccm-core/.classpath +++ b/ccm-core/.classpath @@ -30,7 +30,7 @@ - + diff --git a/ccm-core/.project b/ccm-core/.project index 7af58f767..d2e8225ec 100755 --- a/ccm-core/.project +++ b/ccm-core/.project @@ -5,6 +5,11 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder @@ -13,5 +18,6 @@ org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature diff --git a/ccm-core/src/log4j.properties b/ccm-core/src/log4j.properties index ad9c7fde4..8e12a3bb8 100755 --- a/ccm-core/src/log4j.properties +++ b/ccm-core/src/log4j.properties @@ -61,5 +61,3 @@ log4j.logger.com.arsdigita.packaging.Loader=INFO # For debugging all queries run by persistence #log4j.logger.com.redhat.persistence.engine.rdbms.RDBMSEngine=INFO -log4j.logger.com.arsdigita.cms.contenttypes.ui.GenericOrganizationalUnitAddChildForm=DEBUG -log4j.logger.com.arsdigita.cms.contenttypes.ui.OrganizationChildrenPropertiesStep=DEBUG \ No newline at end of file