I, would vote for hard coding the values. Stefan
James Mason wrote:
Ya, I saw that after I'd fixed the 2.1 branch :).
I don't think PropertyName.RESOURCE_TYPE is in 2.1 (at least my IDE didn't think so, but I didn't double check so I might have configured it wrong). I'm wondering if just hard-coding the values would work, or if backporting the changes to PropertyName would be better.
-James
On Wed, 2005-02-02 at 10:36 +0100, Stefan LÃtzkendorf wrote:
Sorry for that :-(. On the HEAD I made it better. Stefan
using PropertyName.RESOURCE_TYPE as on the
[EMAIL PROTECTED] wrote:
masonjm 2005/02/01 14:57:51
Modified: src/share/org/apache/slide/macro Tag:
SLIDE_2_1_RELEASE_BRANCH MacroImpl.java
Added: src/share/org/apache/slide/util Tag:
SLIDE_2_1_RELEASE_BRANCH WebdavConstants.java
Log:
- Fixed logic for MOVEing resources (retrieve content for *non*-collections)
- Copied WebdavConstants so that builds won't fail (this needs a better solution)
Revision Changes Path
No revision
No revision
1.41.2.5 +6 -6 jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java
Index: MacroImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v
retrieving revision 1.41.2.4
retrieving revision 1.41.2.5
diff -u -r1.41.2.4 -r1.41.2.5
--- MacroImpl.java 14 Jan 2005 09:20:54 -0000 1.41.2.4
+++ MacroImpl.java 1 Feb 2005 22:57:50 -0000 1.41.2.5
@@ -58,7 +58,7 @@
import org.apache.slide.structure.ObjectNotFoundException;
import org.apache.slide.structure.Structure;
import org.apache.slide.util.Configuration;
-import org.apache.slide.webdav.util.WebdavConstants;
+import org.apache.slide.util.WebdavConstants;
import org.apache.slide.event.EventDispatcher;
import org.apache.slide.event.MacroEvent;
import org.apache.slide.event.VetoException;
@@ -684,7 +684,7 @@
contentHelper.retrieve(token, sourceNrds);
NodeRevisionContent sourceNrc = null;
//if (sourceNrd.getContentLength() > 0) {
- if (sourceNrd.propertyValueContains(WebdavConstants.P_RESOURCETYPE, WebdavConstants.E_COLLECTION)) {
+ if (!sourceNrd.propertyValueContains(WebdavConstants.P_RESOURCETYPE, WebdavConstants.E_COLLECTION)) {
sourceNrc =
contentHelper.retrieve(token, sourceNrds, sourceNrd);
}
No revision
No revision
1.1.2.1 +152 -0 jakarta-slide/src/share/org/apache/slide/util/Attic/WebdavConstants.java
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
-- Stefan LÃtzkendorf -- [EMAIL PROTECTED]
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
