Author: tmortagne
Date: 2008-01-11 15:01:31 +0100 (Fri, 11 Jan 2008)
New Revision: 6780
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/packaging/Package.java
Log:
XWIKI-1921: Packager import from directory does not support files with any name
* Remove useless code
* Improve method name
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
2008-01-11 13:32:48 UTC (rev 6779)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
2008-01-11 14:01:31 UTC (rev 6780)
@@ -2439,35 +2439,14 @@
// Note: We don't set the original document as it's already been set
in the constructor
// when this object was instantiated.
}
-
- /**
- * Check if provided xml stream contains wiki document.
- *
- * @param is the xml stream to read.
- * @return true if provided stream contains wiki document.
- */
- public static boolean isXMLWikiDocument(InputStream is)
- {
- boolean validWikiDoc = false;
- try {
- SAXReader reader = new SAXReader();
- Document domdoc = reader.read(is);
-
- validWikiDoc = isXMLWikiDocument(domdoc);
- } catch (DocumentException e1) {
- }
-
- return validWikiDoc;
- }
-
/**
* Check if provided xml document is a wiki document.
*
* @param is the xml document.
* @return true if provided xml document is a wiki document.
*/
- public static boolean isXMLWikiDocument(Document domdoc)
+ public static boolean containsXMLWikiDocument(Document domdoc)
{
return domdoc.getRootElement().getName().equals("xwikidoc");
}
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/packaging/Package.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/packaging/Package.java
2008-01-11 13:32:48 UTC (rev 6779)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/packaging/Package.java
2008-01-11 14:01:31 UTC (rev 6780)
@@ -995,7 +995,7 @@
try {
domdoc = reader.read(new FileInputStream(file));
- validWikiDoc = XWikiDocument.isXMLWikiDocument(domdoc);
+ validWikiDoc =
XWikiDocument.containsXMLWikiDocument(domdoc);
} catch (DocumentException e1) {
}
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
