xlawrence 2005/08/18 09:33:54 CEST
Modified files:
core/src/java/org/jahia/data/beans ContainerBean.java
ContainerListBean.java
ContentBean.java
FieldBean.java
PageBean.java
core/src/java/org/jahia/gui HTMLToolBox.java
Log:
Put back deprecated methods:
- getId() (should now use getID())
- getType (should now use getFieldType() and getPageType())
replaced method getType() by getBeanType()
Revision Changes Path
1.9 +16 -9
jahia/core/src/java/org/jahia/data/beans/ContainerBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/data/beans/ContainerBean.java.diff?r1=1.8&r2=1.9&f=h
1.10 +13 -8
jahia/core/src/java/org/jahia/data/beans/ContainerListBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/data/beans/ContainerListBean.java.diff?r1=1.9&r2=1.10&f=h
1.4 +6 -1 jahia/core/src/java/org/jahia/data/beans/ContentBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/data/beans/ContentBean.java.diff?r1=1.3&r2=1.4&f=h
1.10 +17 -2 jahia/core/src/java/org/jahia/data/beans/FieldBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/data/beans/FieldBean.java.diff?r1=1.9&r2=1.10&f=h
1.11 +22 -20 jahia/core/src/java/org/jahia/data/beans/PageBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/data/beans/PageBean.java.diff?r1=1.10&r2=1.11&f=h
1.18 +2 -3 jahia/core/src/java/org/jahia/gui/HTMLToolBox.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/gui/HTMLToolBox.java.diff?r1=1.17&r2=1.18&f=h
Index: ContainerBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/data/beans/ContainerBean.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ContainerBean.java 17 Aug 2005 08:41:47 -0000 1.8
+++ ContainerBean.java 18 Aug 2005 07:33:53 -0000 1.9
@@ -110,12 +110,20 @@
return null;
}
}
-
+
+ /**
+ *
+ * @deprecated Use getID() instead
+ */
+ public int getId() {
+ return jahiaContainer.getID();
+ }
+
public int getID() {
return jahiaContainer.getID();
}
- public String getType() {
+ public String getBeanType() {
return TYPE;
}
@@ -148,8 +156,7 @@
if (jahiaField == null) {
return null;
}
- final FieldBean fieldBean = new FieldBean(jahiaField,
processingContext);
- return fieldBean;
+ return new FieldBean(jahiaField, processingContext);
} catch (JahiaException je) {
logger.error("Error while retrieving field " + name +
" for container " + getID() + ":", je);
@@ -162,7 +169,7 @@
* get a field value
*
* @param fieldName the field name
- * @throws a critical jahia exception if field not found
+ * @throws JahiaException a critical jahia exception if field not
found
*/
public Object getFieldValue( final String fieldName )
throws JahiaException {
@@ -176,7 +183,7 @@
* @param fieldName
* @param allowDiffVersionHighlight
* @return
- * @throws a critical jahia exception if field not found
+ * @throws JahiaException a critical jahia exception if field not
found
*/
public Object getFieldValue( final String fieldName ,
final boolean allowDiffVersionHighlight,
@@ -199,7 +206,7 @@
*
* @param fieldName the field name
* @param defaultValue
- * @exception throws a critical jahia exception if field not found
+ * @throws JahiaException a critical jahia exception if field not
found
*/
public Object getFieldValue( final String fieldName ,
final String defaultValue ,
@@ -220,7 +227,7 @@
*
* @param fieldName the field name
* @param defaultValue
- * @exception throws a critical jahia exception if field not found
+ * @throws JahiaException a critical jahia exception if field not
found
*/
public Object getFieldValue( final String fieldName, final String
defaultValue )
throws JahiaException {
@@ -236,7 +243,7 @@
* get a field value
*
* @param fieldName the field name
- * @exception throws a critical jahia exception if field not found
+ * @throws JahiaException a critical jahia exception if field not
found
*/
public Object getFieldObject(final String fieldName)
throws JahiaException {
Index: ContainerListBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/data/beans/ContainerListBean.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ContainerListBean.java 17 Aug 2005 08:41:47 -0000 1.9
+++ ContainerListBean.java 18 Aug 2005 07:33:53 -0000 1.10
@@ -83,11 +83,9 @@
if (theList == null) { independantWorkflow = false; return; }
- final int mode = WorkflowService.getInstance().getWorkflowMode(
- theList);
+ final int mode = workflowService.getWorkflowMode(theList);
independantWorkflow = (mode != WorkflowService.LINKED);
- final Map languagesStates = WorkflowService.getInstance().
- getLanguagesStates(theList);
+ final Map languagesStates =
workflowService.getLanguagesStates(theList);
Integer languageState = (Integer) languagesStates.get(
processingContext.getLocale().toString());
final Integer sharedLanguageState = (Integer)languagesStates.
@@ -115,12 +113,20 @@
return null;
}
}
-
+
+ /**
+ *
+ * @deprecated Use getID() instead
+ */
+ public int getId() {
+ return jahiaContainerList.getID();
+ }
+
public int getID() {
return jahiaContainerList.getID();
}
- public String getType() {
+ public String getBeanType() {
return TYPE;
}
@@ -221,8 +227,7 @@
final ContentPage parentContentPage = ContentPage.getPage(
jahiaContainerList.getPageID());
final JahiaPage parentJahiaPage =
parentContentPage.getPage(processingContext);
- final PageBean parentPageBean = new
PageBean(parentJahiaPage, processingContext);
- return parentPageBean;
+ return new PageBean(parentJahiaPage, processingContext);
} catch (JahiaException je) {
logger.error("Error while loading parent page " +
jahiaContainerList.getPageID() +
Index: ContentBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/data/beans/ContentBean.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContentBean.java 17 Aug 2005 08:41:47 -0000 1.3
+++ ContentBean.java 18 Aug 2005 07:33:53 -0000 1.4
@@ -16,6 +16,11 @@
public abstract class ContentBean extends AbstractJahiaObjectBean {
+ /**
+ * @deprecated Use getID() instead
+ */
+ public abstract int getId();
+
public abstract ContentBean getParent();
public abstract int getID();
@@ -28,7 +33,7 @@
* Returns the type of the ContentBean
* @return the type of the ContentBean as a String object
*/
- public abstract String getType();
+ public abstract String getBeanType();
public abstract Map getActionURIBeans();
Index: FieldBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/data/beans/FieldBean.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FieldBean.java 17 Aug 2005 08:41:47 -0000 1.9
+++ FieldBean.java 18 Aug 2005 07:33:53 -0000 1.10
@@ -128,12 +128,20 @@
}
return fieldObject;
}
-
+
+ /**
+ *
+ * @deprecated Use getID() instead
+ */
+ public int getId() {
+ return jahiaField.getID();
+ }
+
public int getID() {
return jahiaField.getID();
}
- public String getType() {
+ public String getBeanType() {
return TYPE;
}
@@ -214,6 +222,13 @@
public int getFieldType() {
return jahiaField.getType();
}
+
+ /**
+ * @deprecated Use getFieldType() instead
+ */
+ public int getType() {
+ return jahiaField.getType();
+ }
public String getIconNameOff() {
return jahiaField.getIconNameOff();
Index: PageBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/data/beans/PageBean.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PageBean.java 17 Aug 2005 08:41:47 -0000 1.10
+++ PageBean.java 18 Aug 2005 07:33:53 -0000 1.11
@@ -83,11 +83,9 @@
private void init(final JahiaPage jahiaPage) throws JahiaException {
final ContentPage thePage = jahiaPage.getContentPage();
- final int mode = WorkflowService.getInstance().getWorkflowMode(
- thePage);
+ final int mode = workflowService.getWorkflowMode(thePage);
independantWorkflow = (mode != WorkflowService.LINKED);
- final Map languagesStates = WorkflowService.getInstance().
- getLanguagesStates(thePage);
+ final Map languagesStates =
workflowService.getLanguagesStates(thePage);
Integer languageState = (Integer) languagesStates.get(
processingContext.getLocale().toString());
final Integer sharedLanguageState = (Integer)languagesStates.
@@ -119,7 +117,7 @@
}
}
- public String getType() {
+ public String getBeanType() {
return TYPE;
}
@@ -148,7 +146,14 @@
return null;
}
}
-
+
+ /**
+ * @deprecated Use getID() instead
+ */
+ public int getId() {
+ return jahiaPage.getID();
+ }
+
public int getID() {
return jahiaPage.getID();
}
@@ -179,7 +184,6 @@
getJahiaContainersService().
getAllPageTopLevelContainerListIDs(
getID(), processingContext.getEntryLoadRequest());
- final ContainerFactory containerFactory =
ContainerFactory.getInstance();
final Iterator containerListIDIter = containerListIDs.iterator();
while (containerListIDIter.hasNext()) {
final Integer curContainerListID = (Integer)
containerListIDIter.next();
@@ -277,6 +281,13 @@
public int getPageType() {
return jahiaPage.getPageType();
}
+
+ /**
+ * @deprecated Use getPageType() instead
+ */
+ public int getType() {
+ return jahiaPage.getPageType();
+ }
public String getUrl() {
try {
@@ -298,7 +309,7 @@
public List getPath() {
try {
- final Enumeration pathEnum =
jahiaPage.getPagePath(processingContext.
+ final Enumeration pathEnum =
jahiaPage.getContentPagePath(processingContext.
getOperationMode(), processingContext.getUser());
final List pathList = new ArrayList();
while (pathEnum.hasMoreElements()) {
@@ -316,7 +327,7 @@
public List getPathWithLevels(final int levels) {
try {
- final Enumeration pathEnum = jahiaPage.getPagePath(levels,
processingContext.
+ final Enumeration pathEnum =
jahiaPage.getContentPagePath(levels, processingContext.
getOperationMode(), processingContext.getUser());
final List pathList = new ArrayList();
while (pathEnum.hasMoreElements()) {
@@ -379,20 +390,11 @@
}
public boolean isCurrentPage() {
- if (jahiaPage.getID() == processingContext.getPageID()) {
- return true;
- } else {
- return false;
- }
+ return getID() == processingContext.getPageID();
}
public boolean isHomePage() {
- final int homePageID = processingContext.getSite().getHomePageID();
- if (homePageID == getID()) {
- return true;
- } else {
- return false;
- }
+ return processingContext.getSite().getHomePageID() == getID();
}
public int getLevel() {
Index: HTMLToolBox.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/gui/HTMLToolBox.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- HTMLToolBox.java 17 Aug 2005 08:41:48 -0000 1.17
+++ HTMLToolBox.java 18 Aug 2005 07:33:53 -0000 1.18
@@ -42,7 +42,6 @@
import org.jahia.services.pages.JahiaPage;
import org.jahia.services.pages.JahiaPageDefinition;
import org.jahia.services.acl.JahiaBaseACL;
-import org.jahia.services.usermanager.JahiaUser;
import org.jahia.bin.Jahia;
import javax.servlet.jsp.JspWriter;
@@ -1175,7 +1174,7 @@
labelKey);
final int objectKey = contentObject.getID();
- final String objectType = contentObject.getType();
+ final String objectType = contentObject.getBeanType();
final ContentBean parent = contentObject.getParent();
final int parentID = (parent == null) ? 0 : parent.getID();
final int definitionID = contentObject.getDefinitionID();
@@ -1354,7 +1353,7 @@
public String buildUniqueContentID(final ContentBean bean) {
final ContentBean parent = bean.getParent();
final int parentID = (parent == null) ? 0 : parent.getID();
- return buildUniqueContentID(bean.getType(), bean.getID(),
+ return buildUniqueContentID(bean.getBeanType(), bean.getID(),
bean.getDefinitionID(), parentID, bean.getPageID());
}
