shuber 2004/12/23 12:35:59 CET
Modified files: (Branch: JAHIA-4-0-BRANCH)
metadata/jbproject/jahia Jahia Libs.library jahia_4_0.jpx
src/java/org/jahia/engines/shared Page_Field.java
Log:
Bugfix : allow changing the title back to the active title, which was not
possible before.
Revision Changes Path
No
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/.diff?r1=.-1&r2=No&f=h
No
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/.diff?r1=.-1&r2=No&f=h
1.1.2.8 +5 -1 jahia/metadata/jbproject/jahia/jahia_4_0.jpx
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/metadata/jbproject/jahia/jahia_4_0.jpx.diff?r1=1.1.2.7&r2=1.1.2.8&f=h
1.72.4.15 +1 -1 jahia/src/java/org/jahia/engines/shared/Page_Field.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/engines/shared/Page_Field.java.diff?r1=1.72.4.14&r2=1.72.4.15&f=h
Index: jahia_4_0.jpx
===================================================================
RCS file:
/home/cvs/repository/jahia/metadata/jbproject/jahia/Attic/jahia_4_0.jpx,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- jahia_4_0.jpx 2 Nov 2004 17:27:27 -0000 1.1.2.7
+++ jahia_4_0.jpx 23 Dec 2004 11:35:58 -0000 1.1.2.8
@@ -12,6 +12,9 @@
<property category="debug.7" name="RemoteHost" value="192.168.2.6"/>
<property category="generalFormatting" name="blockIndent" value="4"/>
<property category="generalFormatting" name="tabSize" value="4"/>
+ <property category="generalFormatting2" name="blockIndent" value="4"/>
+ <property category="generalFormatting2" name="overrideBasicFormatting"
value="1"/>
+ <property category="generalFormatting2" name="tabSize" value="4"/>
<property category="idl" name="ProcessIDL" value="false"/>
<property category="javaFormatting" name="alignMultilineAssign" value="1"/>
<property category="javaFormatting" name="alwaysClasses" value="1"/>
@@ -21,6 +24,7 @@
<property category="javaFormatting" name="extendsOnNewLine" value="0"/>
<property category="javaFormatting" name="finallyOnNewLine" value="0"/>
<property category="javaFormatting" name="implementsOnNewLine" value="0"/>
+ <property category="javaFormatting" name="packagePrefixGroups"
value="java;javax;BLANK_LINE;java.awt;javax.swing;BLANK_LINE;org;(*)"/>
<property category="javaFormatting" name="spaceBeforeMethodDefLparen"
value="1"/>
<property category="javaFormatting" name="throwsOnNewLine" value="1"/>
<property category="javaFormatting" name="whileOnNewLine" value="0"/>
@@ -61,7 +65,7 @@
<property category="runtime.0" name="opentools.otherDirs.1"
value="$JAHIA_TOMCAT/bin/bootstrap.jar"/>
<property category="runtime.0" name="opentools.otherDirs.2"
value="$JBUILDER_RUNTIME_JDK/lib/tools.jar"/>
<property category="runtime.0" name="opentools.parameters" value="start"/>
- <property category="runtime.0" name="opentools.vmparameters"
value="-Djava.endorsed.dirs=$JAHIA_TOMCAT/common/endorsed
-Dcatalina.base=$JAHIA_TOMCAT -Dcatalina.home=$JAHIA_TOMCAT"/>
+ <property category="runtime.0" name="opentools.vmparameters"
value="-Djava.endorsed.dirs=$JAHIA_TOMCAT/common/endorsed
-Dcatalina.base=$JAHIA_TOMCAT -Dcatalina.home=$JAHIA_TOMCAT -Xmx768M"/>
<property category="runtime.1" name="BuildTargetOnRun"
value="com.borland.jbuilder.build.ProjectBuilder$ProjectBuildAction;make"/>
<property category="runtime.1" name="ConfigurationName" value="All Tests"/>
<property category="runtime.1" name="RunnableType"
value="com.borland.jbuilder.runtime.TestRunner"/>
Index: Page_Field.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/engines/shared/Attic/Page_Field.java,v
retrieving revision 1.72.4.14
retrieving revision 1.72.4.15
diff -u -r1.72.4.14 -r1.72.4.15
--- Page_Field.java 10 Nov 2004 14:06:17 -0000 1.72.4.14
+++ Page_Field.java 23 Dec 2004 11:35:59 -0000 1.72.4.15
@@ -732,7 +732,7 @@
// Set Jahia page titles only if changed.
if (contentPage != null &&
(contentPage.hasActiveEntries()||contentPage.hasStagingEntries())) {
Enumeration titlesEnum = pageBean.getTitles().keys();
- Hashtable contentPageTitles = contentPage.getTitles(false);
+ Hashtable contentPageTitles = contentPage.getTitles(true);
// Look for all page titles stored in the page bean and set the
page
// that has changed.
boolean titleHasChanged = false;
