diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
commit | d1fa08fdc9cb11dccee76d668ff85df30458c295 (patch) | |
tree | 1d19df6405103577d872902486792e8c23bce711 /trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/LogicalEquality.java | |
parent | d7c5ad7d6263fd1baf9bfdbaa4c50b70ef2fbdb2 (diff) | |
parent | 70d1f9d6fcaefe611e778b8dbf3bafea8934aa08 (diff) | |
download | etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.gz etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.bz2 etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.zip |
Merge remote branch 'upstream/master'
Conflicts:
etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
etherpad/src/etherpad/control/pro/pro_main_control.js
etherpad/src/etherpad/control/pro_help_control.js
etherpad/src/etherpad/globals.js
etherpad/src/etherpad/legacy_urls.js
etherpad/src/etherpad/pne/pne_utils.js
etherpad/src/etherpad/pro/pro_utils.js
etherpad/src/main.js
etherpad/src/plugins/fileUpload/templates/fileUpload.ejs
etherpad/src/plugins/testplugin/templates/page.ejs
etherpad/src/static/css/pad2_ejs.css
etherpad/src/static/css/pro-help.css
etherpad/src/static/img/jun09/pad/protop.gif
etherpad/src/static/js/store.js
etherpad/src/themes/default/templates/framed/framedheader-pro.ejs
etherpad/src/themes/default/templates/main/home.ejs
etherpad/src/themes/default/templates/pro-help/main.ejs
etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs
infrastructure/com.etherpad/licensing.scala
trunk/etherpad/src/etherpad/collab/ace/contentcollector.js
trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js
trunk/etherpad/src/static/css/home-opensource.css
trunk/etherpad/src/static/js/ace.js
trunk/etherpad/src/static/js/linestylefilter_client.js
trunk/etherpad/src/templates/email/eepnet_license_info.ejs
trunk/etherpad/src/templates/pad/pad_body2.ejs
trunk/etherpad/src/templates/pad/pad_content.ejs
trunk/etherpad/src/templates/pad/padfull_body.ejs
trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs
Diffstat (limited to 'trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/LogicalEquality.java')
-rw-r--r-- | trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/LogicalEquality.java | 367 |
1 files changed, 0 insertions, 367 deletions
diff --git a/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/LogicalEquality.java b/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/LogicalEquality.java deleted file mode 100644 index b525aff..0000000 --- a/trunk/infrastructure/rhino1_7R1/deprecatedsrc/org/mozilla/javascript/xml/impl/xmlbeans/LogicalEquality.java +++ /dev/null @@ -1,367 +0,0 @@ -/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- - * - * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Rhino code, released - * May 6, 1999. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1997-2000 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Ethan Hugg - * - * Alternatively, the contents of this file may be used under the terms of - * the GNU General Public License Version 2 or later (the "GPL"), in which - * case the provisions of the GPL are applicable instead of those above. If - * you wish to allow use of your version of this file only under the terms of - * the GPL and not to allow others to use your version of this file under the - * MPL, indicate your decision by deleting the provisions above and replacing - * them with the notice and other provisions required by the GPL. If you do - * not delete the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * - * ***** END LICENSE BLOCK ***** */ - -package org.mozilla.javascript.xml.impl.xmlbeans; - -import org.apache.xmlbeans.XmlCursor; - -import java.util.*; - - -public class LogicalEquality -{ - public static boolean nodesEqual(XmlCursor xmlOne, XmlCursor xmlTwo) - { - boolean result = false; - - if (xmlOne.isStartdoc()) - { - xmlOne.toFirstContentToken(); - } - - if (xmlTwo.isStartdoc()) - { - xmlTwo.toFirstContentToken(); - } - - if (xmlOne.currentTokenType() == xmlTwo.currentTokenType()) - { - if (xmlOne.isEnddoc()) - { - // Both empty - result = true; - } - else if (xmlOne.isAttr()) - { - result = attributesEqual(xmlOne, xmlTwo); - } - else if (xmlOne.isText()) - { - result = textNodesEqual(xmlOne, xmlTwo); - } - else if (xmlOne.isComment()) - { - result = commentsEqual(xmlOne, xmlTwo); - } - else if (xmlOne.isProcinst()) - { - result = processingInstructionsEqual(xmlOne, xmlTwo); - } - else if (xmlOne.isStart()) - { - // Compare root elements - result = elementsEqual(xmlOne, xmlTwo); - } - } - - return result; - } - - private static boolean elementsEqual(XmlCursor xmlOne, XmlCursor xmlTwo) - { - boolean result = true; - - if (!qnamesEqual(xmlOne.getName(), xmlTwo.getName())) - { - result = false; - } - else - { - // These filter out empty text nodes. - nextToken(xmlOne); - nextToken(xmlTwo); - - do - { - if (xmlOne.currentTokenType() != xmlTwo.currentTokenType()) - { - // Not same token - result = false; - break; - } - else if (xmlOne.isEnd()) - { - // Done with this element, step over end - break; - } - else if (xmlOne.isEnddoc()) - { - // Shouldn't get here - break; - } - else if (xmlOne.isAttr()) - { - // This one will move us to the first non-attr token. - result = attributeListsEqual(xmlOne, xmlTwo); - } - else - { - if (xmlOne.isText()) - { - result = textNodesEqual(xmlOne, xmlTwo); - } - else if (xmlOne.isComment()) - { - result = commentsEqual(xmlOne, xmlTwo); - } - else if (xmlOne.isProcinst()) - { - result = processingInstructionsEqual(xmlOne, xmlTwo); - } - else if (xmlOne.isStart()) - { - result = elementsEqual(xmlOne, xmlTwo); - } - else - { - //XML.log("Unknown token type" + xmlOne.currentTokenType()); - } - - // These filter out empty text nodes. - nextToken(xmlOne); - nextToken(xmlTwo); - } - } - while(result); - } - - return result; - } - - /** - * - * @param xmlOne - * @param xmlTwo - * @return - */ - private static boolean attributeListsEqual(XmlCursor xmlOne, XmlCursor xmlTwo) - { - boolean result = true; - TreeMap mapOne = loadAttributeMap(xmlOne); - TreeMap mapTwo = loadAttributeMap(xmlTwo); - - if (mapOne.size() != mapTwo.size()) - { - result = false; - } - else - { - Set keysOne = mapOne.keySet(); - Set keysTwo = mapTwo.keySet(); - Iterator itOne = keysOne.iterator(); - Iterator itTwo = keysTwo.iterator(); - - while (result && itOne.hasNext()) - { - String valueOne = (String) itOne.next(); - String valueTwo = (String) itTwo.next(); - - if (!valueOne.equals(valueTwo)) - { - result = false; - } - else - { - javax.xml.namespace.QName qnameOne = (javax.xml.namespace.QName) mapOne.get(valueOne); - javax.xml.namespace.QName qnameTwo = (javax.xml.namespace.QName) mapTwo.get(valueTwo); - - if (!qnamesEqual(qnameOne, qnameTwo)) - { - result = false; - } - } - } - } - - return result; - } - - /** - * - * @param xml - * @return - */ - private static TreeMap loadAttributeMap(XmlCursor xml) - { - TreeMap result = new TreeMap(); - - while (xml.isAttr()) - { - result.put(xml.getTextValue(), xml.getName()); - nextToken(xml); - } - - return result; - } - - /** - * - * @param xmlOne - * @param xmlTwo - * @return - */ - private static boolean attributesEqual(XmlCursor xmlOne, XmlCursor xmlTwo) - { - boolean result = false; - - if (xmlOne.isAttr() && xmlTwo.isAttr()) - { - if (qnamesEqual(xmlOne.getName(), xmlTwo.getName())) - { - if (xmlOne.getTextValue().equals(xmlTwo.getTextValue())) - { - result = true; - } - } - } - - return result; - } - - /** - * - * @param xmlOne - * @param xmlTwo - * @return - */ - private static boolean textNodesEqual(XmlCursor xmlOne, XmlCursor xmlTwo) - { - boolean result = false; - - if (xmlOne.isText() && xmlTwo.isText()) - { - if (xmlOne.getChars().equals(xmlTwo.getChars())) - { - result = true; - } - } - - return result; - } - - /** - * - * @param xmlOne - * @param xmlTwo - * @return - */ - private static boolean commentsEqual(XmlCursor xmlOne, XmlCursor xmlTwo) - { - boolean result = false; - - if (xmlOne.isComment() && xmlTwo.isComment()) - { - if (xmlOne.getTextValue().equals(xmlTwo.getTextValue())) - { - result = true; - } - } - - return result; - } - - /** - * - * @param xmlOne - * @param xmlTwo - * @return - */ - private static boolean processingInstructionsEqual(XmlCursor xmlOne, XmlCursor xmlTwo) - { - boolean result = false; - - if (xmlOne.isProcinst() && xmlTwo.isProcinst()) - { - if (qnamesEqual(xmlOne.getName(), xmlTwo.getName())) - { - if (xmlOne.getTextValue().equals(xmlTwo.getTextValue())) - { - result = true; - } - } - } - - return result; - } - - /** - * - * @param qnameOne - * @param qnameTwo - * @return - */ - private static boolean qnamesEqual(javax.xml.namespace.QName qnameOne, javax.xml.namespace.QName qnameTwo) - { - boolean result = false; - - if (qnameOne.getNamespaceURI().equals(qnameTwo.getNamespaceURI())) - { - if (qnameOne.getLocalPart().equals(qnameTwo.getLocalPart())) - { - return true; - } - } - - return result; - } - - /** - * filter out empty textNodes here - * - * @param xml - */ - private static void nextToken(XmlCursor xml) - { - do - { - xml.toNextToken(); - - if (!xml.isText()) - { - // Not a text node - break; - } - else if (xml.getChars().trim().length() > 0) - { - // Text node is not empty - break; - } - } - while (true); - } -} |