Author: xlawrence
Date: Thu Jun 28 09:11:08 2007
New Revision: 17814
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17814&repname=
=3Djahia
Log:
Do not commit yet mark for delete modifications and added missing declareFi=
eld method
Modified:
trunk/core/src/java/org/jahia/data/containers/JahiaContainerSet.java
trunk/core/src/java/org/jahia/gui/GuiBean.java
Modified: trunk/core/src/java/org/jahia/data/containers/JahiaContainerSet.j=
ava
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/containers/JahiaContainerSet.java&rev=3D17814&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/data/containers/JahiaContainerSet.java (o=
riginal)
+++ trunk/core/src/java/org/jahia/data/containers/JahiaContainerSet.java Th=
u Jun 28 09:11:08 2007
@@ -238,10 +238,41 @@
* @param indexableField true by default, false if the field should no=
t be indexed
* @throws JahiaException
*/
- public void declareField (String containerName, String fieldName, Stri=
ng fieldTitle,
- int fieldType, String defaultValue, String[]=
aliasNames, float boostFactor,
- boolean indexableField)
- throws JahiaException {
+ public void declareField(String containerName,
+ String fieldName,
+ String fieldTitle,
+ int fieldType,
+ String defaultValue,
+ String[] aliasNames,
+ float boostFactor,
+ boolean indexableField)
+ throws JahiaException {
+ declareField(containerName, fieldName, fieldTitle, fieldType, defa=
ultValue, aliasNames, boostFactor,
+ indexableField, false);
+ }
+
+ /**
+ *
+ * @param containerName
+ * @param fieldName
+ * @param fieldTitle
+ * @param fieldType
+ * @param defaultValue
+ * @param aliasNames
+ * @param boostFactor the search boost factor, 1.0 by default
+ * @param indexableField true by default, false if the field should no=
t be indexed
+ * @throws JahiaException
+ */
+ public void declareField(String containerName,
+ String fieldName,
+ String fieldTitle,
+ int fieldType,
+ String defaultValue,
+ String[] aliasNames,
+ float boostFactor,
+ boolean indexableField,
+ boolean readOnly)
+ throws JahiaException {
/** @todo ensure that the data provided by the user has no special=
chars in it */
// we check if a field with the same name was not already declared=
, of if the field has no
// empty name or title
Modified: trunk/core/src/java/org/jahia/gui/GuiBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/gui/GuiBean.java&rev=3D17814&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/gui/GuiBean.java (original)
+++ trunk/core/src/java/org/jahia/gui/GuiBean.java Thu Jun 28 09:11:08 2007
@@ -32,13 +32,11 @@
import org.jahia.data.containers.JahiaContainerListPagination;
import org.jahia.data.fields.JahiaField;
import org.jahia.engines.JahiaEngine;
-import org.jahia.engines.restorelivecontainer.RestoreLiveContainer_Engine;
import org.jahia.engines.containerlistproperties.ContainerListProperties_E=
ngine;
import org.jahia.engines.filemanager.DAVFilemanager_Engine;
import org.jahia.engines.filemanager.TableEntry;
import org.jahia.exceptions.JahiaException;
import org.jahia.params.ProcessingContext;
-import org.jahia.params.ParamBean;
import org.jahia.registries.EnginesRegistry;
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.acl.ACLResource;
@@ -330,16 +328,6 @@
append("?screen=3Dsave").toString());
}
=
- /**
- * @param contentContainer
- * @return
- * @throws JahiaException
- */
- public String drawRestoreContainerUrl(final ContentContainer contentCo=
ntainer)
- throws JahiaException {
- return drawUrlCheckWriteAccess(RestoreLiveContainer_Engine.ENGINE_=
NAME, contentContainer);
- }
-
public String drawAjaxFileManagerUrl() throws JahiaException {
final StringBuffer buff =3D new StringBuffer();
return drawUrl(DAVFilemanager_Engine.ENGINE_NAME, buff.append("/pi=
d/").append(jParams.getPageID()).
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
