From 0fb5c8bdde63b7e45fa7490d7ffc6a4fe462428d Mon Sep 17 00:00:00 2001 From: Bastian Triller Date: Sat, 17 Nov 2012 14:58:08 +0100 Subject: [PATCH] some javadoc cleanup --- .../Ajax/Sources/er/ajax/AjaxExpansion.java | 2 +- .../Ajax/Ajax/Sources/er/ajax/AjaxResponse.java | 8 ++++---- .../Ajax/Ajax/Sources/er/ajax/AjaxUtils.java | 12 ++++++------ .../Sources/er/directtoweb/ERDirectToWeb.java | 4 ++-- .../assignments/ERDConfigurationAssignment.java | 2 +- .../assignments/ERDEntityAssignment.java | 4 ++-- .../assignments/ERDImageNameAssignment.java | 2 +- .../ERDInstanceCreationAssignment.java | 4 ++-- .../assignments/ERDKeyValueAssignment.java | 4 +--- .../assignments/ERDLocalizedAssignment.java | 2 +- .../ERDLocalizedMessageAssignment.java | 2 +- .../ERDRelationshipSortAssignment.java | 4 ++-- .../ERDSmartAttributeAssignment.java | 4 ++-- .../ERDSmartRelationshipAssignment.java | 4 ++-- .../ERDSortedManyToManyAssignment.java | 2 +- .../ERDTabConfigurationAssignment.java | 2 +- .../assignments/ERDTabDictionaryComputer.java | 2 +- .../ERDTabSectionsContentsAssignment.java | 9 ++++----- .../defaults/ERDDefaultActionAssignment.java | 3 +-- ...DDefaultAjaxConfigurationNameAssignment.java | 2 +- ...DDefaultCancelCreationMessageAssignment.java | 5 ++--- .../ERDDefaultClassStringAssignment.java | 2 +- .../ERDDefaultConfigurationNameAssignment.java | 2 +- .../ERDDefaultDisplayNameAssignment.java | 3 +-- .../ERDDefaultEntityNameAssignment.java | 5 ++--- .../ERDDefaultFormControlNameAssignment.java | 3 +-- .../defaults/ERDDefaultIDAssignment.java | 3 +-- .../defaults/ERDDefaultModelAssignment.java | 3 +-- .../ERDDefaultPropertyNameAssignment.java | 5 ++--- .../defaults/ERDDefaultsAssignment.java | 2 +- .../defaults/ERDDefaultsEmbeddedAssignment.java | 3 +-- .../delayed/ERDDelayedBooleanAssignment.java | 2 +- .../ERDDelayedConditionalAssignment.java | 2 +- .../delayed/ERDDelayedKeyValueAssignment.java | 2 +- .../delayed/ERDDelayedLocalizedAssignment.java | 3 +-- .../ERDDelayedNonNullConditionalAssignment.java | 6 ++---- .../ERDDelayedObjectCreationAssignment.java | 4 ++-- .../ERDDelayedRelationshipFlagAssignment.java | 4 +--- .../Sources/er/directtoweb/pages/ERD2WPage.java | 17 ++++++++--------- .../er/extensions/appserver/ERXSession.java | 16 ++++++++-------- .../er/extensions/appserver/ERXWOContext.java | 16 ++++++++-------- .../er/extensions/eof/ERXEnterpriseObject.java | 2 +- .../eof/ERXEntityClassDescription.java | 10 +++++----- .../er/extensions/foundation/ERXProperties.java | 13 +++++++------ .../migration/ERXMigrationDatabase.java | 2 +- .../qualifiers/ERXChainedQualifierUtils.java | 4 +--- .../statistics/ERXStatisticsStore.java | 3 +-- .../defaults/ERMDDefaultCSSAssignment.java | 3 +-- .../ERMDDefaultConfigurationNameAssignment.java | 3 +-- .../repetitions/ERMDListPageRepetition.java | 2 +- 50 files changed, 103 insertions(+), 125 deletions(-) diff --git a/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxExpansion.java b/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxExpansion.java index 8eb525714c8..19c568dde72 100644 --- a/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxExpansion.java +++ b/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxExpansion.java @@ -193,7 +193,7 @@ public boolean isAjaxRequest() { /** * Returns an escaped version of {@link #string()} using - * {@link ERXStringUtilities#escapeJavascriptApostrophes(String)}. + * {@link er.extensions.foundation.ERXStringUtilities#escapeJavascriptApostrophes(String)}. * * @return escaped string */ diff --git a/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxResponse.java b/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxResponse.java index 97ebf6bd16b..03ac5abe81b 100644 --- a/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxResponse.java +++ b/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxResponse.java @@ -32,7 +32,7 @@ public class AjaxResponse extends ERXResponse { * tag along. For instance, if you have an area at the top of your pages that * show errors or notifications, you may want all of your ajax responses to have * a chance to trigger an update of this area, so you could register an - * AjaxResponseAppender that renders a javascript block that calls + * {@link er.ajax.AjaxResponseAppender} that renders a javascript block that calls * MyNotificationsUpdate() only if there are notifications to be shown. Without * response appenders, you would have to include a check in all of your * components to do this. @@ -151,7 +151,7 @@ public WOActionResults handleNullActionResults(WORequest request, WOResponse res /** * Convenience method that calls AjaxUtils.appendScriptHeaderIfNecessary with this request. - * @see AjaxUtils#appendScriptHeaderIfNecessary(WORequest, WOResponse) + * @see er.ajax.AjaxUtils#appendScriptHeaderIfNecessary(WORequest, WOResponse) */ public void appendScriptHeaderIfNecessary() { AjaxUtils.appendScriptHeaderIfNecessary(_request, this); @@ -159,7 +159,7 @@ public void appendScriptHeaderIfNecessary() { /** * Convenience method that calls AjaxUtils.appendScriptFooterIfNecessary with this request. - * @see AjaxUtils#appendScriptFooterIfNecessary(WORequest, WOResponse) + * @see er.ajax.AjaxUtils#appendScriptFooterIfNecessary(WORequest, WOResponse) */ public void appendScriptFooterIfNecessary() { AjaxUtils.appendScriptFooterIfNecessary(_request, this); @@ -167,7 +167,7 @@ public void appendScriptFooterIfNecessary() { /** * Convenience method that calls AjaxUtils.updateDomElement with this request. - * @see AjaxUtils#updateDomElement(WOResponse, String, Object, String, String, String) + * @see er.ajax.AjaxUtils#updateDomElement(WOResponse, String, Object, String, String, String) */ public void updateDomElement(String id, Object value, String numberFormat, String dateFormat, String valueWhenEmpty) { AjaxUtils.updateDomElement(this, id, value, numberFormat, dateFormat, valueWhenEmpty); diff --git a/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxUtils.java b/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxUtils.java index b680b255e41..e579d32dc90 100644 --- a/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxUtils.java +++ b/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxUtils.java @@ -128,7 +128,7 @@ public static void addScriptResourceInHead(WOContext context, WOResponse respons } /** - * Calls ERXWOContext.addScriptResourceInHead with "Ajax" framework + * Calls {@link ERXResponseRewriter#addScriptResourceInHead(WOContext, WOResponse, String, String)} with "Ajax" framework * * @param context * @param response @@ -139,7 +139,7 @@ public static void addScriptResourceInHead(WOContext context, WOResponse respons } /** - * Calls ERXWOContext.addStylesheetResourceInHead + * Calls {@link ERXResponseRewriter#addStylesheetResourceInHead(WOContext, WOResponse, String, String)} * * @param context * @param response @@ -151,7 +151,7 @@ public static void addStylesheetResourceInHead(WOContext context, WOResponse res } /** - * Calls ERXWOContext.addStylesheetResourceInHead with "Ajax" framework + * Calls {@link ERXResponseRewriter#addStylesheetResourceInHead(WOContext, WOResponse, String, String)} with "Ajax" framework * * @param context * @param response @@ -200,7 +200,7 @@ public static void addResourceInHead(WOContext context, WOResponse response, Str } /** - * Calls ERXWOContext.addScriptCodeInHead. + * Calls {@link er.extensions.appserver.ERXResponseRewriter#addScriptCodeInHead(WOResponse, WOContext, String)}. * * @param response * @param context @@ -211,7 +211,7 @@ public static void addScriptCodeInHead(WOResponse response, WOContext context, S } /** - * @deprecated use {@link ERXStringUtilities#safeIdentifierName(String)} + * @deprecated use {@link er.extensions.foundation.ERXStringUtilities#safeIdentifierName(String)} */ @Deprecated public static String toSafeElementID(String elementID) { @@ -255,7 +255,7 @@ public static void updateMutableUserInfoWithAjaxInfo(WOMessage message) { } /** - * Returns an AjaxResponse with the given javascript as the body of the response. + * Returns an {@link er.ajax.AjaxResponse} with the given javascript as the body of the response. * * @param context the WOContext * @param javascript the javascript to send diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERDirectToWeb.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERDirectToWeb.java index fabce3ccc86..c259e118285 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERDirectToWeb.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERDirectToWeb.java @@ -57,8 +57,8 @@ * Principle class of the ERDirectToWeb framework. * This class is loaded when the NSBundle of this * framework is loaded. When loaded this class configures - * the directtoweb runtime to use the {@link ERD2WModel} and - * {@link ERD2WFactory} subclasses instead of the default + * the directtoweb runtime to use the {@link er.directtoweb.ERD2WModel} and + * {@link er.directtoweb.ERD2WFactory} subclasses instead of the default * implementations. See each class for a description of the * additions/improvements made to the base implementation. * This class also has a bunch of utility methods that are diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDConfigurationAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDConfigurationAssignment.java index c44528bbdd5..022114bb73e 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDConfigurationAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDConfigurationAssignment.java @@ -11,7 +11,7 @@ import er.directtoweb.assignments.defaults.ERDDefaultConfigurationNameAssignment; /** - * @deprecated use {@link ERDDefaultConfigurationNameAssignment} + * @deprecated use {@link er.directtoweb.assignments.defaults.ERDDefaultConfigurationNameAssignment} */ @Deprecated public class ERDConfigurationAssignment extends ERDDefaultConfigurationNameAssignment { diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDEntityAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDEntityAssignment.java index 456974c7e04..c1cddd80b16 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDEntityAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDEntityAssignment.java @@ -18,7 +18,7 @@ import er.extensions.eof.ERXEOAccessUtilities; /** - * @deprecated use a {@link ERDKeyValueAssignment} or a {@link ERDDefaultModelAssignment} with key entityForPageConfiguration instead + * @deprecated use a {@link er.directtoweb.assignments.ERDKeyValueAssignment} or a {@link er.directtoweb.assignments.defaults.ERDDefaultModelAssignment} with key entityForPageConfiguration instead */ @Deprecated public class ERDEntityAssignment extends Assignment implements ERDComputingAssignmentInterface { @@ -64,7 +64,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu public ERDEntityAssignment(String key, Object value) { super(key,value); } /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment depends upon the context key: "pageConfiguration". This key * is used when constructing the significant keys for the passed in keyPath. * @param keyPath to compute significant keys for. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDImageNameAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDImageNameAssignment.java index 740b56b6393..0b47b42780a 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDImageNameAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDImageNameAssignment.java @@ -58,7 +58,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu public ERDImageNameAssignment (String key, Object value) { super(key,value); } /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment depends upon the context keys: "baseImageDirectory", "sectionKey", * and "tabKey". This array of keys is used when constructing the * significant keys for the passed in keyPath. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDInstanceCreationAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDInstanceCreationAssignment.java index 414b22edff4..cbaf3341f93 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDInstanceCreationAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDInstanceCreationAssignment.java @@ -19,7 +19,7 @@ * Assignment used to create objects on the fly. You use this by * specifing the class name as a string, ie "foo.bar.MyClass". This * will create an instance of the MyClass object. - * @deprecated use {@link ERDDelayedObjectCreationAssignment} + * @deprecated use {@link er.directtoweb.assignments.delayed.ERDDelayedObjectCreationAssignment} */ @Deprecated public class ERDInstanceCreationAssignment extends ERDDelayedAssignment { @@ -66,7 +66,7 @@ public ERDInstanceCreationAssignment (EOKeyValueUnarchiver u) { public ERDInstanceCreationAssignment (String key, Object value) { super(key,value); } /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment depends upon the context key: "entity.name". This array * of keys is used when constructing the * significant keys for the passed in keyPath. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDKeyValueAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDKeyValueAssignment.java index 371bc2941c9..86e0ff7b18f 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDKeyValueAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDKeyValueAssignment.java @@ -10,8 +10,6 @@ import com.webobjects.directtoweb.D2WContext; import com.webobjects.eocontrol.EOKeyValueUnarchiver; -import er.directtoweb.assignments.delayed.ERDDelayedKeyValueAssignment; - /** * Piece of crap. This assignment works around the * fact that KeyValueAssignment isn't public (and should be). @@ -21,7 +19,7 @@ * assignment will be cached the first time this assignment is * fired. To have a key value assignment that does not cache * the value returned the first time have a look at - * {@link ERDDelayedKeyValueAssignment}. + * {@link er.directtoweb.assignments.delayed.ERDDelayedKeyValueAssignment}. */ public class ERDKeyValueAssignment extends Assignment { /** diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDLocalizedAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDLocalizedAssignment.java index ab37f53e85e..d3be556dc73 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDLocalizedAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDLocalizedAssignment.java @@ -61,7 +61,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu public ERDLocalizedAssignment (String key, Object value) { super(key,value); } /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment depends upon the template keys from the value of this assignment. * This array of keys is used when constructing the * significant keys for the passed in keyPath. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDLocalizedMessageAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDLocalizedMessageAssignment.java index 97e167819ab..befc205658b 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDLocalizedMessageAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDLocalizedMessageAssignment.java @@ -4,7 +4,7 @@ import er.directtoweb.assignments.delayed.ERDDelayedLocalizedAssignment; /** - * @deprecated use {@link ERDDelayedLocalizedAssignment} + * @deprecated use {@link er.directtoweb.assignments.delayed.ERDDelayedLocalizedAssignment} */ @Deprecated public class ERDLocalizedMessageAssignment extends ERDDelayedLocalizedAssignment { diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDRelationshipSortAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDRelationshipSortAssignment.java index 85de47d69d9..79703efe7d5 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDRelationshipSortAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDRelationshipSortAssignment.java @@ -16,7 +16,7 @@ /** * Relationship sort assignment that works with the new caching * scheme. Should only ever need one of these assignments. - * @deprecated use {@link ERDDefaultModelAssignment} + * @deprecated use {@link er.directtoweb.assignments.defaults.ERDDefaultModelAssignment} */ @Deprecated public class ERDRelationshipSortAssignment extends ERDAssignment { @@ -60,7 +60,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu public ERDRelationshipSortAssignment(EOKeyValueUnarchiver unarchiver) { super(unarchiver); } /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment depends upon the context keys: "propertyKey" and * "keyWhenRelationship". This array of keys is used when constructing the * significant keys for the passed in keyPath. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDSmartAttributeAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDSmartAttributeAssignment.java index 3b131993e2d..c2c7419560c 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDSmartAttributeAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDSmartAttributeAssignment.java @@ -29,7 +29,7 @@ * not find it is that it uses the Model to find out the EOAttribute * and starts from A. Following the relationship b, gives a B, and * asking B for an attribute named k returns nil and you lose. - * @deprecated use {@link ERDDefaultModelAssignment} + * @deprecated use {@link er.directtoweb.assignments.defaults.ERDDefaultModelAssignment} */ // Note that these assignments require that the object is pushed into the context. Look // on some of the ERInspectPage setObject methods we push the object into the context. @@ -62,7 +62,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu } /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment depends upon the context keys: "object.entityName" and * "propertyKey". This array of keys is used when constructing the * significant keys for the passed in keyPath. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDSmartRelationshipAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDSmartRelationshipAssignment.java index 8327f2e0ba7..1de2353eb43 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDSmartRelationshipAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDSmartRelationshipAssignment.java @@ -31,7 +31,7 @@ * find it is that it uses the Model to find out the EORelationship * and starts from A. Following the relationship b, gives a B, and * asking B for a relationship named k returns null and you lose. - * @deprecated use {@link ERDDefaultModelAssignment} + * @deprecated use {@link er.directtoweb.assignments.defaults.ERDDefaultModelAssignment} */ // Note that these assignments require that the object is pushed into the context. Look // on some of the ERInspectPage setObject methods we push the object into the context. @@ -63,7 +63,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu } /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment depends upon the context keys: "propertyKey" and * "object.entityName". This array of keys is used when constructing the * significant keys for the passed in keyPath. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDSortedManyToManyAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDSortedManyToManyAssignment.java index 0947a1b55b6..b00c81f2d1b 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDSortedManyToManyAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDSortedManyToManyAssignment.java @@ -61,7 +61,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu public ERDSortedManyToManyAssignment(EOKeyValueUnarchiver unarchiver) { super(unarchiver); } /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment depends upon the context keys: "propertyKey" and * "keyWhenRelationship". This array of keys is used when constructing the * significant keys for the passed in keyPath. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDTabConfigurationAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDTabConfigurationAssignment.java index 5faa92d20c1..6fc2d490177 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDTabConfigurationAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDTabConfigurationAssignment.java @@ -15,7 +15,7 @@ // MOVEME: ERDConfigurationAssignment /** * Generated pageConfigurations that will use the tab inspect templates.
- * @deprecated use {@link ERDDefaultConfigurationNameAssignment} with key inspectTabConfigurationName + * @deprecated use {@link er.directtoweb.assignments.defaults.ERDDefaultConfigurationNameAssignment} with key inspectTabConfigurationName */ @Deprecated public class ERDTabConfigurationAssignment extends ERDDefaultConfigurationNameAssignment { diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDTabDictionaryComputer.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDTabDictionaryComputer.java index 976bc580a51..4fa361f6743 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDTabDictionaryComputer.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDTabDictionaryComputer.java @@ -54,7 +54,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu public ERDTabDictionaryComputer (String key, Object value) { super(key,value); } /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment depends upon the context key: "displayPropertyKeys". * This array of keys is used when constructing the * significant keys for the passed in keyPath. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDTabSectionsContentsAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDTabSectionsContentsAssignment.java index 2c024bf9ce9..3b3bcd85bab 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDTabSectionsContentsAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDTabSectionsContentsAssignment.java @@ -14,12 +14,11 @@ import com.webobjects.foundation.NSMutableArray; import er.directtoweb.ERD2WContainer; -import er.directtoweb.pages.ERD2WTabInspectPage; /** * Assignment used to construct and cache the * tab sections containers used with tab insepct - * pages. See {@link ERD2WTabInspectPage} for + * pages. See {@link er.directtoweb.pages.ERD2WTabInspectPage} for * information on the formats of a tab section. */ // FIXME: Should subclass Assignment instead @@ -58,7 +57,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu public ERDTabSectionsContentsAssignment (String key, Object value) { super(key,value); } /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment is not dependent on any context keys. * @return empty array. */ @@ -67,9 +66,9 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu /** * Called when firing this assignment with the key-path: * tabSectionsContents. Constructs an array of - * {@link ERD2WContainer}s representing each tab and + * {@link er.directtoweb.ERD2WContainer}s representing each tab and * optionally another array of containers representing - * each section. See {@link ERD2WTabInspectPage} for the + * each section. See {@link er.directtoweb.pages.ERD2WTabInspectPage} for the * exact format of the tabs and sections. * @return array of containers for each tab */ diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultActionAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultActionAssignment.java index f1434c3d600..2894bfe1b13 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultActionAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultActionAssignment.java @@ -13,7 +13,6 @@ import com.webobjects.foundation.NSMutableArray; import er.directtoweb.assignments.ERDAssignment; -import er.directtoweb.assignments.ERDComputingAssignmentInterface; /** * This assignment calculates default actions for the current page @@ -56,7 +55,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu public ERDDefaultActionAssignment (String key, Object value) { super(key,value); } /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment depends upon the context keys: "entity.name" and * "object.entityName". This array of keys is used when constructing the * significant keys for the passed in keyPath. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultAjaxConfigurationNameAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultAjaxConfigurationNameAssignment.java index 4a0e7c7abcd..c3fabeee616 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultAjaxConfigurationNameAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultAjaxConfigurationNameAssignment.java @@ -10,7 +10,7 @@ * Note: As they mirror the default configurations, the assignment class is separate (and a subclass). * This means that the default configurations can be overridden in the rules more gracefully. * - * @see ERDDefaultConfigurationNameAssignment + * @see er.directtoweb.assignments.defaults.ERDDefaultConfigurationNameAssignment * * @author mendis */ diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultCancelCreationMessageAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultCancelCreationMessageAssignment.java index c46a5e1cb14..6f085adfd06 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultCancelCreationMessageAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultCancelCreationMessageAssignment.java @@ -11,14 +11,13 @@ import com.webobjects.foundation.NSArray; import er.directtoweb.assignments.ERDAssignment; -import er.directtoweb.assignments.ERDComputingAssignmentInterface; import er.directtoweb.assignments.ERDLocalizableAssignmentInterface; import er.directtoweb.assignments.ERDLocalizedAssignment; // FIXME: Should be renamed ERDDefaultLocalizedMessageAssignment. /** * Message assignment used when hitting a cancel button, just a little "Are you sure?" kind of thing.
- * @deprecated use {@link ERDLocalizedAssignment} + * @deprecated use {@link er.directtoweb.assignments.ERDLocalizedAssignment} */ @Deprecated public class ERDDefaultCancelCreationMessageAssignment extends ERDAssignment implements ERDLocalizableAssignmentInterface { @@ -60,7 +59,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu public ERDDefaultCancelCreationMessageAssignment (String key, Object value) { super(key,value); } /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment depends upon the context key: "entity.name". This array * of keys is used when constructing the * significant keys for the passed in keyPath. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultClassStringAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultClassStringAssignment.java index 242723bc9fb..3f3705249e7 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultClassStringAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultClassStringAssignment.java @@ -47,7 +47,7 @@ public class ERDDefaultClassStringAssignment extends ERDAssignment { }); /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This array + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This array * of keys is used when constructing the * significant keys for the passed in keyPath. * @param keyPath to compute significant keys for. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultConfigurationNameAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultConfigurationNameAssignment.java index 93a0ff4bb2b..2d43af3fa19 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultConfigurationNameAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultConfigurationNameAssignment.java @@ -57,7 +57,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu public ERDDefaultConfigurationNameAssignment (String key, Object value) { super(key,value); } /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment depends upon the context keys: "entity.name" and * "object.entityName". This array of keys is used when constructing the * significant keys for the passed in keyPath. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultDisplayNameAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultDisplayNameAssignment.java index e920167eda5..890acd66bdf 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultDisplayNameAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultDisplayNameAssignment.java @@ -11,7 +11,6 @@ import com.webobjects.foundation.NSDictionary; import er.directtoweb.assignments.ERDAssignment; -import er.directtoweb.assignments.ERDComputingAssignmentInterface; import er.directtoweb.assignments.ERDLocalizableAssignmentInterface; import er.extensions.foundation.ERXDictionaryUtilities; import er.extensions.foundation.ERXStringUtilities; @@ -50,7 +49,7 @@ public class ERDDefaultDisplayNameAssignment extends ERDAssignment implements ER }); /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This array + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This array * of keys is used when constructing the * significant keys for the passed in keyPath. * @param keyPath to compute significant keys for. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultEntityNameAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultEntityNameAssignment.java index 0cab1646b4d..5339d2a50d4 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultEntityNameAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultEntityNameAssignment.java @@ -15,7 +15,6 @@ import com.webobjects.foundation.NSArray; import er.directtoweb.assignments.ERDAssignment; -import er.directtoweb.assignments.ERDComputingAssignmentInterface; import er.directtoweb.assignments.ERDLocalizableAssignmentInterface; import er.extensions.foundation.ERXStringUtilities; @@ -24,7 +23,7 @@ // keys passing in the current keyPath. /** * Beautify the entity name.
- * @deprecated for entityName, use {@link ERDDefaultModelAssignment}, for displayNameForEntity and displayNameForDestinationEntity use {@link ERDDefaultDisplayNameAssignment} + * @deprecated for entityName, use {@link er.directtoweb.assignments.defaults.ERDDefaultModelAssignment}, for displayNameForEntity and displayNameForDestinationEntity use {@link er.directtoweb.assignments.defaults.ERDDefaultDisplayNameAssignment} */ @Deprecated public class ERDDefaultEntityNameAssignment extends ERDAssignment implements ERDLocalizableAssignmentInterface { @@ -70,7 +69,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu public ERDDefaultEntityNameAssignment (String key, Object value) { super(key,value); } /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment depends upon the context key: "entity.name". This array * of keys is used when constructing the * significant keys for the passed in keyPath. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultFormControlNameAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultFormControlNameAssignment.java index 60ac72e0356..503b44aed9e 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultFormControlNameAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultFormControlNameAssignment.java @@ -8,7 +8,6 @@ import com.webobjects.foundation.NSDictionary; import er.directtoweb.assignments.ERDAssignment; -import er.directtoweb.assignments.ERDComputingAssignmentInterface; import er.extensions.foundation.ERXDictionaryUtilities; import er.extensions.foundation.ERXStringUtilities; @@ -42,7 +41,7 @@ public class ERDDefaultFormControlNameAssignment extends ERDAssignment { }); /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This array + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This array * of keys is used when constructing the * significant keys for the passed in keyPath. * @param keyPath to compute significant keys for. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultIDAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultIDAssignment.java index 2092b2adaf4..ab828b4ff1e 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultIDAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultIDAssignment.java @@ -9,7 +9,6 @@ import com.webobjects.foundation.NSDictionary; import er.directtoweb.assignments.ERDAssignment; -import er.directtoweb.assignments.ERDComputingAssignmentInterface; import er.extensions.eof.ERXEOControlUtilities; import er.extensions.foundation.ERXDictionaryUtilities; import er.extensions.foundation.ERXStringUtilities; @@ -57,7 +56,7 @@ public class ERDDefaultIDAssignment extends ERDAssignment { }); /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This array + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This array * of keys is used when constructing the * significant keys for the passed in keyPath. * @param keyPath to compute significant keys for. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultModelAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultModelAssignment.java index 91b5e30bf6c..a8c4bbd3051 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultModelAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultModelAssignment.java @@ -22,7 +22,6 @@ import com.webobjects.foundation.NSDictionary; import er.directtoweb.assignments.ERDAssignment; -import er.directtoweb.assignments.ERDComputingAssignmentInterface; import er.extensions.eof.ERXConstant; import er.extensions.eof.ERXEOAccessUtilities; import er.extensions.foundation.ERXDictionaryUtilities; @@ -72,7 +71,7 @@ public class ERDDefaultModelAssignment extends ERDAssignment { }); /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This array + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This array * of keys is used when constructing the * significant keys for the passed in keyPath. * @param keyPath to compute significant keys for. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultPropertyNameAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultPropertyNameAssignment.java index 71e7a9921e6..ee26db10199 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultPropertyNameAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultPropertyNameAssignment.java @@ -13,13 +13,12 @@ import com.webobjects.foundation.NSArray; import er.directtoweb.assignments.ERDAssignment; -import er.directtoweb.assignments.ERDComputingAssignmentInterface; import er.directtoweb.assignments.ERDLocalizableAssignmentInterface; import er.extensions.foundation.ERXStringUtilities; /** * Beautify the propertyKey name in a better way.
- * @deprecated use {@link ERDDefaultDisplayNameAssignment} + * @deprecated use {@link er.directtoweb.assignments.defaults.ERDDefaultDisplayNameAssignment} */ @Deprecated public class ERDDefaultPropertyNameAssignment extends ERDAssignment implements ERDLocalizableAssignmentInterface { @@ -64,7 +63,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu public ERDDefaultPropertyNameAssignment (String key, Object value) { super(key,value); } /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment depends upon the context key: "propertyKey". This array * of keys is used when constructing the * significant keys for the passed in keyPath. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultsAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultsAssignment.java index 6ad4681ec8f..e4eff38b880 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultsAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultsAssignment.java @@ -12,7 +12,7 @@ /** - * @deprecated use {@link ERDDefaultModelAssignment} + * @deprecated use {@link er.directtoweb.assignments.defaults.ERDDefaultModelAssignment} */ @Deprecated public class ERDDefaultsAssignment extends ERDDefaultModelAssignment { diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultsEmbeddedAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultsEmbeddedAssignment.java index 12ede40fa4d..fcb470f8e52 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultsEmbeddedAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultsEmbeddedAssignment.java @@ -18,7 +18,6 @@ import com.webobjects.foundation.NSMutableArray; import er.directtoweb.assignments.ERDAssignment; -import er.directtoweb.assignments.ERDComputingAssignmentInterface; import er.extensions.foundation.ERXStringUtilities; import er.extensions.localization.ERXLocalizer; @@ -75,7 +74,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu public ERDDefaultsEmbeddedAssignment (String key, Object value) { super(key,value); } /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment depends upon the context keys: "propertyKey", "object.entityName", * and "embeddedEntityName". This array of keys is used when constructing the * significant keys for the passed in keyPath. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedBooleanAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedBooleanAssignment.java index 3dc394b86df..0f447a86406 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedBooleanAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedBooleanAssignment.java @@ -66,7 +66,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu public ERDDelayedBooleanAssignment(String key, Object value) { super(key,value); } /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment depends upon the value of the key "conditionKey" of the * value of this assignment. This key is used when constructing the * significant keys for the passed in keyPath. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedConditionalAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedConditionalAssignment.java index d2a93899d53..043d93e5843 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedConditionalAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedConditionalAssignment.java @@ -73,7 +73,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu public NSArray _dependentKeys; /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment depends upon all of the qualifier keys from the formed * qualifier of the value of this assignment. This array of keys is * used when constructing the significant keys for the passed in keyPath. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedKeyValueAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedKeyValueAssignment.java index 0a9c1712fcf..627293b272d 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedKeyValueAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedKeyValueAssignment.java @@ -59,7 +59,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu public ERDDelayedKeyValueAssignment(String key, Object value) { super(key,value); } /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment depends upon an array composed of the value * of this assignment. This array of keys is used when constructing the * significant keys for the passed in keyPath. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedLocalizedAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedLocalizedAssignment.java index 48f0f18c311..9dfb881347d 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedLocalizedAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedLocalizedAssignment.java @@ -5,11 +5,10 @@ import com.webobjects.eocontrol.EOKeyValueUnarchiver; import er.directtoweb.assignments.ERDLocalizableAssignmentInterface; -import er.directtoweb.assignments.ERDLocalizedAssignment; import er.extensions.localization.ERXLocalizer; /** - * Same as {@link ERDLocalizedAssignment}, except that firing is delayed. + * Same as {@link er.directtoweb.assignments.ERDLocalizedAssignment}, except that firing is delayed. */ public class ERDDelayedLocalizedAssignment extends ERDDelayedAssignment implements ERDLocalizableAssignmentInterface { /** diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedNonNullConditionalAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedNonNullConditionalAssignment.java index 9ac98accd69..dc8e1a58478 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedNonNullConditionalAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedNonNullConditionalAssignment.java @@ -13,8 +13,6 @@ import com.webobjects.foundation.NSArray; import com.webobjects.foundation.NSDictionary; -import er.directtoweb.assignments.ERDComputingAssignmentInterface; - /** * The delayed non-null conditional is a way to provide a * branching result from a rule resolution. The value of this @@ -93,7 +91,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu public ERDDelayedNonNullConditionalAssignment(String key, Object value) { super(key,value); } /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment depends upon an array composed of the single value * "nonNullKeyPath" from the dictionary of the value of this assignment. * This array of keys is used when constructing the @@ -108,7 +106,7 @@ public NSArray dependentKeys(String keyPath) { /** * Implementation of the abstract method from - * {@link ERDDelayedAssignment}. This method is + * {@link er.directtoweb.assignments.delayed.ERDDelayedAssignment}. This method is * called each time this Assignment is resolved * from the rule firing cache. For the non-null * conditional the dictionary key 'nonNullKeyPath' diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedObjectCreationAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedObjectCreationAssignment.java index 42da9146102..1bfbde7794a 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedObjectCreationAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedObjectCreationAssignment.java @@ -20,7 +20,7 @@ * can be used in two different manner. The first is by just * specifing the class name as a string, ie "foo.bar.MyClass". This * will create an instance of the MyClass object. The second form - * allows one to specify the object to be created in a dictionary format: + * allows one to specify the object to be created in a dictionary format:
  * {
  * 	className = "foo.bar.MyClass";
  *	arguments = ( {
@@ -30,7 +30,7 @@
  *			className = "java.lang.String";
  *			contextKey = "propertyKey";
  * 		});
- * }
+ * }
 * * This will create an object of type MyClass using the constructor: * MyClass(WOSession session, String key), using the arguments found diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedRelationshipFlagAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedRelationshipFlagAssignment.java index 93a490aa5af..9d426897bec 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedRelationshipFlagAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedRelationshipFlagAssignment.java @@ -9,12 +9,10 @@ import com.webobjects.foundation.NSArray; import com.webobjects.foundation.NSMutableArray; -import er.directtoweb.components.relationships.ERD2WDisplayRelationshipFlag; - /** * Creates the needed values to have dymamic values in a list page repetition. * Answers on displayPropertyKeys and displayNameForProperty. - * @see ERD2WDisplayRelationshipFlag for more info + * @see er.directtoweb.components.relationships.ERD2WDisplayRelationshipFlag for more info * @author ak * */ diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPage.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPage.java index 7cec4d7d085..b49fde31c9d 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPage.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPage.java @@ -43,7 +43,6 @@ import com.webobjects.foundation._NSUtilities; import er.directtoweb.ERD2WContainer; -import er.directtoweb.ERD2WDirectAction; import er.directtoweb.ERDirectToWeb; import er.directtoweb.delegates.ERDBranchDelegate; import er.directtoweb.delegates.ERDBranchDelegateInterface; @@ -289,10 +288,10 @@ public boolean hasActualChanges() { } /** - * Implementation of the {@link ERXComponentActionRedirector.Restorable} + * Implementation of the {@link er.extensions.appserver.ERXComponentActionRedirector.Restorable} * interface. This implementation creates an URL with the name of the * current pageConfiguration as a direct action, which assumes a - * {@link ERD2WDirectAction} as the default direct action. Subclasses need + * {@link er.directtoweb.ERD2WDirectAction} as the default direct action. Subclasses need * to implement more sensible behaviour. * * @return url for the current page @@ -839,7 +838,7 @@ public String branchName() { /** * Calculates the branch choices for the current page. This method is just a * cover for calling the method branchChoicesForContext on - * the current {@link ERDBranchDelegate ERDBranchDelegate}. + * the current {@link er.directtoweb.delegates.ERDBranchDelegate ERDBranchDelegate}. * * @return array of branch choices */ @@ -893,7 +892,7 @@ public void setCurrentSection(ERD2WContainer value) { /** * The display keys for the current section. You bind to this method. * - * @return array of {@link ERD2WContainer} holding the keys for the current + * @return array of {@link er.directtoweb.ERD2WContainer} holding the keys for the current * section */ public NSArray currentSectionKeys() { @@ -914,7 +913,7 @@ public NSArray currentSectionKeys() { /** * The array of sections. You bind to this method. * - * @return array of arrays of {@link ERD2WContainer} holding the keys. + * @return array of arrays of {@link er.directtoweb.ERD2WContainer} holding the keys. */ public NSArray sectionsContents() { if (_sectionsContents == null) { @@ -934,11 +933,11 @@ public NSArray sectionsContents() { // Display property key extensions (Tabs) // ************************************************************************** - /** Holds the array of {@link ERD2WContainer} defining the tabs. */ + /** Holds the array of {@link er.directtoweb.ERD2WContainer} defining the tabs. */ private NSArray _tabSectionsContents; /** - * Returns the array of {@link ERD2WContainer} defining the tabs. A tab is a + * Returns the array of {@link er.directtoweb.ERD2WContainer} defining the tabs. A tab is a * key and an array of sections */ public NSArray tabSectionsContents() { @@ -992,7 +991,7 @@ public NSArray sectionsForCurrentTab() { /** Holds the current tab. */ private ERD2WContainer _currentTab; - /** Returns the {@link ERD2WContainer} defining the current tab. */ + /** Returns the {@link er.directtoweb.ERD2WContainer} defining the current tab. */ public ERD2WContainer currentTab() { if (_currentTab == null && tabSectionsContents() != null && tabSectionsContents().count() > 0) { //If firstTab is not null, then try to find the tab named firstTab diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXSession.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXSession.java index b2fe80e2d4b..75f93d14de9 100644 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXSession.java +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXSession.java @@ -168,7 +168,7 @@ public void localizationDidReset(NSNotification n) { /** * registers this observer object for - * {@link ERXLocalizer.LocalizationDidResetNotification} + * {@link er.extensions.localization.ERXLocalizer#LocalizationDidResetNotification} */ private void registerForLocalizationDidResetNotification() { NSNotificationCenter.defaultCenter().addObserver(this, new NSSelector("localizationDidReset", ERXConstant.NotificationClassArray), ERXLocalizer.LocalizationDidResetNotification, null); @@ -179,7 +179,7 @@ private void registerForLocalizationDidResetNotification() { * Method to get the current localizer for this * session. If local instance variable is null * then a localizer is fetched for the session's - * languages array. See {@link ERXLocalizer} + * languages array. See {@link er.extensions.localization.ERXLocalizer} * for more information about using a localizer. * @return the current localizer for this session */ @@ -207,7 +207,7 @@ public String language() { * Cover method to set the current localizer * to the localizer for that language. *

- * Also updates languages list with the new single language. + * Also updates languages list with the new single language. * * @param language to set the current localizer for. * @see #language @@ -265,14 +265,14 @@ public void setLanguages(NSArray languageList) { /** * Returns the NSArray of language names available for * this application. This is simply a cover method of - * {@link ERXLocalizer#availableLanguages}, + * {@link er.extensions.localization.ERXLocalizer#availableLanguages}, * but will be convenient for binding to dynamic elements * like language selector popup. * * @return NSArray of language name strings available * for this application * @see #availableLanguagesForThisSession - * @see ERXLocalizer#availableLanguages + * @see er.extensions.localization.ERXLocalizer#availableLanguages */ public NSArray availableLanguagesForTheApplication() { return ERXLocalizer.availableLanguages(); @@ -284,7 +284,7 @@ public NSArray availableLanguagesForTheApplication() { * The resulting array is an intersect of web browser's * language array ({@link ERXRequest#browserLanguages}) * and localizer's available language array - * ({@link ERXLocalizer#availableLanguages}). + * ({@link er.extensions.localization.ERXLocalizer#availableLanguages}). *

* Note that the order of the resulting language names * is not defined at this moment. @@ -293,7 +293,7 @@ public NSArray availableLanguagesForTheApplication() { * for this particular session * @see #availableLanguagesForTheApplication * @see ERXRequest#browserLanguages - * @see ERXLocalizer#availableLanguages + * @see er.extensions.localization.ERXLocalizer#availableLanguages */ public NSArray availableLanguagesForThisSession() { NSArray browserLanguages = null; @@ -361,7 +361,7 @@ public NSMutableDictionary debuggingStore() { /** * Ensures that the returned editingContext was created with - * the {@link ERXEC} factory. + * the {@link er.extensions.eof.ERXEC} factory. * @return the session's default editing context with * the default delegate set. */ diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXWOContext.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXWOContext.java index 80e30264b06..7b4cd22f9ef 100644 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXWOContext.java +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXWOContext.java @@ -362,7 +362,7 @@ public static NSArray _componentPath(WOContext context) { /** * - * @deprecated replaced by {@link ERXResponseRewriter} + * @deprecated replaced by {@link er.extensions.appserver.ERXResponseRewriter} */ @Deprecated public static String _htmlCloseHeadTag() { @@ -370,7 +370,7 @@ public static String _htmlCloseHeadTag() { } /** - * @deprecated replaced by {@link ERXResponseRewriter} + * @deprecated replaced by {@link er.extensions.appserver.ERXResponseRewriter} */ @Deprecated public static void insertInResponseBeforeTag(WOContext context, WOResponse response, String content, String tag, TagMissingBehavior tagMissingBehavior) { @@ -378,7 +378,7 @@ public static void insertInResponseBeforeTag(WOContext context, WOResponse respo } /** - * @deprecated replaced by {@link ERXResponseRewriter} + * @deprecated replaced by {@link er.extensions.appserver.ERXResponseRewriter} */ @Deprecated public static void addScriptResourceInHead(WOContext context, WOResponse response, String framework, String fileName) { @@ -386,7 +386,7 @@ public static void addScriptResourceInHead(WOContext context, WOResponse respons } /** - * @deprecated replaced by {@link ERXResponseRewriter} + * @deprecated replaced by {@link er.extensions.appserver.ERXResponseRewriter} */ @Deprecated public static void addStylesheetResourceInHead(WOContext context, WOResponse response, String framework, String fileName) { @@ -394,7 +394,7 @@ public static void addStylesheetResourceInHead(WOContext context, WOResponse res } /** - * @deprecated replaced by {@link ERXResponseRewriter} + * @deprecated replaced by {@link er.extensions.appserver.ERXResponseRewriter} */ @Deprecated public static void addScriptCodeInHead(WOContext context, WOResponse response, String script) { @@ -402,7 +402,7 @@ public static void addScriptCodeInHead(WOContext context, WOResponse response, S } /** - * @deprecated replaced by {@link ERXResponseRewriter} + * @deprecated replaced by {@link er.extensions.appserver.ERXResponseRewriter} */ @Deprecated public static void addScriptCodeInHead(WOContext context, WOResponse response, String script, String scriptName) { @@ -410,7 +410,7 @@ public static void addScriptCodeInHead(WOContext context, WOResponse response, S } /** - * @deprecated replaced by {@link ERXResponseRewriter} + * @deprecated replaced by {@link er.extensions.appserver.ERXResponseRewriter} */ @Deprecated public static void addResourceInHead(WOContext context, WOResponse response, String framework, String fileName, String startTag, String endTag) { @@ -418,7 +418,7 @@ public static void addResourceInHead(WOContext context, WOResponse response, Str } /** - * @deprecated replaced by {@link ERXResponseRewriter} + * @deprecated replaced by {@link er.extensions.appserver.ERXResponseRewriter} */ @Deprecated public static void addResourceInHead(WOContext context, WOResponse response, String framework, String fileName, String startTag, String endTag, TagMissingBehavior tagMissingBehavior) { diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEnterpriseObject.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEnterpriseObject.java index d6f304af57e..4165100cd64 100644 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEnterpriseObject.java +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEnterpriseObject.java @@ -470,7 +470,7 @@ public abstract void removeObjectsFromPropertyWithKey(NSArray * 指定プロパティー名とデフォルト暗号化方法 (propertyName.encrypted=true) を使って復元されている値を戻します。 * 例えば、my.password を取得する場合、my.password.encrypted=true も設定されていれば、 - * my.password は復元する時にデフォルト暗号化方法 {@link ERXCrypto.defaultCrypter} を使用します。 + * my.password は復元する時にデフォルト暗号化方法 {@link er.extensions.crypting.ERXCrypto.defaultCrypter} を使用します。 * * @param propertyName - プロパティー名 * @@ -1168,7 +1168,7 @@ public static String decryptedStringForKey(String propertyName) { * * If the propertyName.encrypted property is set to true, returns * the plain text value of the given property name, after decrypting it with the - * {@link ERXCrypto.defaultCrypter}. For instance, if you are requesting + * {@link er.extensions.crypting.ERXCrypto.defaultCrypter}. For instance, if you are requesting * my.password and my.password.encrypted is set to true, * the value of my.password will be sent to the default crypter's * decrypt() method. @@ -1182,7 +1182,7 @@ public static String decryptedStringForKey(String propertyName) { * * 指定プロパティー名とデフォルト暗号化方法 (propertyName.encrypted=true) を使って復元されている値を戻します。 * 例えば、my.password を取得する場合、my.password.encrypted=true も設定されていれば、 - * my.password は復元する時にデフォルト暗号化方法 {@link ERXCrypto.defaultCrypter} を使用します。 + * my.password は復元する時にデフォルト暗号化方法 {@link er.extensions.crypting.ERXCrypto.defaultCrypter} を使用します。 * * @param propertyName - プロパティー名 * @param defaultValue - プロパティーが無ければ、デフォルト値 @@ -1210,7 +1210,7 @@ public static String decryptedStringForKeyWithDefault(String propertyName, Strin /** * * Returns the decrypted value for the given property name using the - * {@link ERXCrypto.defaultCrypter}. This is slightly different than + * {@link er.extensions.crypting.ERXCrypto.defaultCrypter}. This is slightly different than * decryptedStringWithKeyWithDefault in that it does not require the encrypted * property to be set. * @@ -1223,7 +1223,7 @@ public static String decryptedStringForKeyWithDefault(String propertyName, Strin * * 指定プロパティー名とデフォルト暗号化方法 (propertyName.encrypted=true) を使って復元されている値を戻します。 * 例えば、my.password を取得する場合、my.password.encrypted=true も設定されていれば、 - * my.password は復元する時にデフォルト暗号化方法 {@link ERXCrypto.defaultCrypter} を使用します。 + * my.password は復元する時にデフォルト暗号化方法 {@link er.extensions.crypting.ERXCrypto.defaultCrypter} を使用します。 * * @param propertyName - プロパティー名 * @param defaultValue - プロパティーが無ければ、暗号化されているデフォルト値 @@ -1464,7 +1464,8 @@ public static Properties propertiesFromPath(String path) { * @throws java.io.IOException if the file is not found or cannot be read * */ - public static Properties propertiesFromFile(File file) throws java.io.IOException { + @SuppressWarnings("javadoc") + public static Properties propertiesFromFile(File file) throws java.io.IOException { if (file == null) throw new IllegalStateException("Attempting to get properties for a null file!"); ERXProperties._Properties prop = new ERXProperties._Properties(); diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/migration/ERXMigrationDatabase.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/migration/ERXMigrationDatabase.java index 0c9a5c6da94..692a47671e3 100644 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/migration/ERXMigrationDatabase.java +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/migration/ERXMigrationDatabase.java @@ -297,7 +297,7 @@ public boolean is(String name) { } /** - * @see ERXJDBCUtilities#databaseProductName(EOAdaptorChannel) + * @see er.extensions.jdbc.ERXJDBCUtilities#databaseProductName(EOAdaptorChannel) * @return database product name */ public String productName() { diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/qualifiers/ERXChainedQualifierUtils.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/qualifiers/ERXChainedQualifierUtils.java index 33a9c9e0dd3..423de662237 100644 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/qualifiers/ERXChainedQualifierUtils.java +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/qualifiers/ERXChainedQualifierUtils.java @@ -3,8 +3,6 @@ import com.webobjects.eocontrol.EOQualifier; import com.webobjects.foundation.NSMutableArray; -import er.extensions.eof.ERXQ; - /** * ERXQ * @@ -40,7 +38,7 @@ public static ERXAndQualifier and(EOQualifier originalQualifier, EOQualifier... * @param originalQualifier * the qualifier to negate * @return an ERXNotQualifier - * @deprecated use {@link ERXQ#not(EOQualifier)} instead + * @deprecated use {@link er.extensions.eof.ERXQ#not(EOQualifier)} instead */ @Deprecated public static ERXNotQualifier not(EOQualifier originalQualifier) { diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java index 3e7e1bc5bb6..2e0d00d04d8 100644 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java @@ -22,7 +22,6 @@ import com.webobjects.foundation.NSMutableDictionary; import er.extensions.appserver.ERXApplication; -import er.extensions.appserver.ERXSession; import er.extensions.eof.ERXEC; import er.extensions.eof.ERXObjectStoreCoordinator; import er.extensions.foundation.ERXProperties; @@ -46,7 +45,7 @@ * @property er.extensions.ERXStatisticsStore.milliSeconds.fatal defaults to 5 minutes * * @author ak - * @author kieran (Oct 14, 2009) - minor changes to capture thread name in middle of the request (useful for {@link ERXSession#threadName()}} + * @author kieran (Oct 14, 2009) - minor changes to capture thread name in middle of the request (useful for {@link er.extensions.appserver.ERXSession#threadName()}} */ public class ERXStatisticsStore extends WOStatisticsStore { diff --git a/Frameworks/D2W/ERModernDirectToWeb/Sources/er/modern/directtoweb/assignments/defaults/ERMDDefaultCSSAssignment.java b/Frameworks/D2W/ERModernDirectToWeb/Sources/er/modern/directtoweb/assignments/defaults/ERMDDefaultCSSAssignment.java index 9de3565d33e..31e82c2f1f4 100644 --- a/Frameworks/D2W/ERModernDirectToWeb/Sources/er/modern/directtoweb/assignments/defaults/ERMDDefaultCSSAssignment.java +++ b/Frameworks/D2W/ERModernDirectToWeb/Sources/er/modern/directtoweb/assignments/defaults/ERMDDefaultCSSAssignment.java @@ -8,7 +8,6 @@ import com.webobjects.foundation.NSDictionary; import er.directtoweb.assignments.ERDAssignment; -import er.directtoweb.assignments.ERDComputingAssignmentInterface; import er.extensions.foundation.ERXDictionaryUtilities; import er.extensions.foundation.ERXStringUtilities; @@ -66,7 +65,7 @@ public class ERMDDefaultCSSAssignment extends ERDAssignment { }); /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This array + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This array * of keys is used when constructing the * significant keys for the passed in keyPath. * @param keyPath to compute significant keys for. diff --git a/Frameworks/D2W/ERModernDirectToWeb/Sources/er/modern/directtoweb/assignments/defaults/ERMDDefaultConfigurationNameAssignment.java b/Frameworks/D2W/ERModernDirectToWeb/Sources/er/modern/directtoweb/assignments/defaults/ERMDDefaultConfigurationNameAssignment.java index f8de2729a39..678ae09b47c 100644 --- a/Frameworks/D2W/ERModernDirectToWeb/Sources/er/modern/directtoweb/assignments/defaults/ERMDDefaultConfigurationNameAssignment.java +++ b/Frameworks/D2W/ERModernDirectToWeb/Sources/er/modern/directtoweb/assignments/defaults/ERMDDefaultConfigurationNameAssignment.java @@ -5,7 +5,6 @@ import com.webobjects.foundation.NSArray; import com.webobjects.foundation.NSDictionary; -import er.directtoweb.assignments.ERDComputingAssignmentInterface; import er.directtoweb.assignments.defaults.ERDDefaultConfigurationNameAssignment; import er.extensions.foundation.ERXDictionaryUtilities; @@ -54,7 +53,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu public ERMDDefaultConfigurationNameAssignment (String key, Object value) { super(key,value); } /** - * Implementation of the {@link ERDComputingAssignmentInterface}. This + * Implementation of the {@link er.directtoweb.assignments.ERDComputingAssignmentInterface}. This * assignment depends upon the context keys: "entity.name" and * "object.entityName". This array of keys is used when constructing the * significant keys for the passed in keyPath. diff --git a/Frameworks/D2W/ERModernDirectToWeb/Sources/er/modern/directtoweb/components/repetitions/ERMDListPageRepetition.java b/Frameworks/D2W/ERModernDirectToWeb/Sources/er/modern/directtoweb/components/repetitions/ERMDListPageRepetition.java index 4b83a8a2ce5..169105f17f7 100644 --- a/Frameworks/D2W/ERModernDirectToWeb/Sources/er/modern/directtoweb/components/repetitions/ERMDListPageRepetition.java +++ b/Frameworks/D2W/ERModernDirectToWeb/Sources/er/modern/directtoweb/components/repetitions/ERMDListPageRepetition.java @@ -6,7 +6,7 @@ /** * Table based list repetition. I've not looked at this very closely. I currently use - * {@link ERMSimpleListPageRepetition} this is included for backwards compatibility. + * {@link er.modern.directtoweb.components.repetitions.ERMDSimpleListPageRepetition} this is included for backwards compatibility. * * @binding displayGroup * @binding d2wContext