svn commit: r836234 - in /incubator/jspwiki/trunk: ./ src/WebContent/WEB-INF/classes/ src/java/org/apache/wiki/ src/java/org/apache/wiki/action/

[metskem]

Author: metskem
Date: Sat Nov 14 18:17:12 2009
New Revision: 836234

URL: http://svn.apache.org/viewvc?rev=836234&view=rev
Log:
3.0.0-svn-179
        * JSPWIKI-608, EditActionBean should not warn for page.lock after 
preview
        * some CoreResources files had no value for assertedName, causing a 
weird Preferences page

Modified:
    incubator/jspwiki/trunk/ChangeLog
    
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties
    
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties
    
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
    incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java

Modified: incubator/jspwiki/trunk/ChangeLog
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=836234&r1=836233&r2=836234&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sat Nov 14 18:17:12 2009
@@ -1,5 +1,13 @@
 2009-11-14 Harry Metske <mets...@apache.org>
 
+        * 3.0.0-svn-179
+        
+        * JSPWIKI-608, EditActionBean should not warn for page.lock after 
preview
+        
+        * some CoreResources files had no value for assertedName, causing a 
weird Preferences page
+        
+2009-11-14 Harry Metske <mets...@apache.org>
+
         * 3.0.0-svn-178
         
         * placeholders in edit.locked i18n key were not properly numbered in 
some languages

Modified: 
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties?rev=836234&r1=836233&r2=836234&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties 
(original)
+++ 
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties 
Sat Nov 14 18:17:12 2009
@@ -253,9 +253,9 @@
 # Formerly prefs.save.submit
 org.apache.wiki.action.UserProfileActionBean.save=Save profile
 #Formerly prefs.assertedname
-assertedName=
+assertedName=Name
 #Formerly edit.chooseeditor
-editor=Name
+editor=Editor
 #Formerly prefs.user.sectionediting
 sectionEditing=Section editing
 #Formerly prefs.user.skin

Modified: 
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties?rev=836234&r1=836233&r2=836234&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties
 (original)
+++ 
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties
 Sat Nov 14 18:17:12 2009
@@ -257,9 +257,9 @@
 # Formerly prefs.save.submit
 org.apache.wiki.action.UserProfileActionBean.save=Profil speichern
 #Formerly prefs.assertedname
-assertedName=
+assertedName=Name
 #Formerly edit.chooseeditor
-editor=Name
+editor=Editor
 #Formerly prefs.user.sectionediting
 sectionEditing=abschnittsweises Bearbeiten
 #Formerly prefs.user.skin

Modified: 
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties?rev=836234&r1=836233&r2=836234&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
 (original)
+++ 
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
 Sat Nov 14 18:17:12 2009
@@ -254,7 +254,7 @@
 # Formerly prefs.save.submit
 
org.apache.wiki.action.UserProfileActionBean.save=\u4fdd\u5b58\u6982\u8981\u4fe1\u606f
 #Formerly prefs.assertedname
-assertedName=
+assertedName=???
 #Formerly edit.chooseeditor
 editor=\u540d\u5b57
 #Formerly prefs.user.sectionediting

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=836234&r1=836233&r2=836234&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sat Nov 14 
18:17:12 2009
@@ -77,7 +77,7 @@
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "178";
+    public static final String     BUILD         = "179";
 
     /**
      *  This is the generic version string you should use

Modified: 
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java?rev=836234&r1=836233&r2=836234&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java 
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java 
Sat Nov 14 18:17:12 2009
@@ -219,7 +219,7 @@
         WikiEngine engine = wikiContext.getEngine();
         ContentManager mgr = engine.getContentManager();
         PageLock lock = mgr.getCurrentLock( page );
-        if( lock != null )
+        if( lock != null && !lock.getLocker().equals( 
wikiContext.getCurrentUser().getName() ) )
         {
             messages.add( new LocalizableMessage( "edit.locked", 
lock.getLocker(), lock.getTimeLeft() ) );
         }