Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDejan Gloszic2006-01-16 19:37:29 -0500
committerDejan Gloszic2006-01-16 19:37:29 -0500
commitcf27d0c9f82909089a6a348b54b9521d7fa9732d (patch)
tree0a763f738cb98155353d4e365b72bbb399dbabf7
parenta7c7661d3ef62e501e130d2f386bfbcf92113162 (diff)
downloadeclipse.platform.ua-20060116.tar.gz
eclipse.platform.ua-20060116.tar.xz
eclipse.platform.ua-20060116.zip
*** empty log message ***v20060116
-rw-r--r--org.eclipse.help.base/META-INF/MANIFEST.MF1
-rw-r--r--org.eclipse.help.base/plugin.xml6
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/base/DynamicContentProducer.java (renamed from org.eclipse.help/src/org/eclipse/help/internal/DynamicContentProducer.java)4
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/XHTMLSearchParticipant.java2
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/AbstractUAElement.java (renamed from org.eclipse.help/src/org/eclipse/help/internal/xhtml/AbstractUAElement.java)4
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/BundleUtil.java (renamed from org.eclipse.help/src/org/eclipse/help/internal/xhtml/BundleUtil.java)2
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/DOMUtil.java (renamed from org.eclipse.help/src/org/eclipse/help/internal/xhtml/DOMUtil.java)2
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/UAContentFilterProcessor.java (renamed from org.eclipse.help/src/org/eclipse/help/internal/xhtml/UAContentFilterProcessor.java)10
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/UAContentMergeProcessor.java (renamed from org.eclipse.help/src/org/eclipse/help/internal/xhtml/UAContentMergeProcessor.java)2
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/UAContentParser.java (renamed from org.eclipse.help/src/org/eclipse/help/internal/xhtml/UAContentParser.java)2
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/UAInclude.java (renamed from org.eclipse.help/src/org/eclipse/help/internal/xhtml/UAInclude.java)2
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/UATopicExtension.java (renamed from org.eclipse.help/src/org/eclipse/help/internal/xhtml/UATopicExtension.java)2
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/UATransformManager.java (renamed from org.eclipse.help/src/org/eclipse/help/internal/xhtml/UATransformManager.java)2
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/XHTMLSupport.java (renamed from org.eclipse.help/src/org/eclipse/help/internal/xhtml/XHTMLSupport.java)10
-rw-r--r--org.eclipse.help/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.help/plugin.xml7
16 files changed, 32 insertions, 29 deletions
diff --git a/org.eclipse.help.base/META-INF/MANIFEST.MF b/org.eclipse.help.base/META-INF/MANIFEST.MF
index b2f13b1ca..b2ba279b4 100644
--- a/org.eclipse.help.base/META-INF/MANIFEST.MF
+++ b/org.eclipse.help.base/META-INF/MANIFEST.MF
@@ -15,6 +15,7 @@ Export-Package: org.eclipse.help.browser,
org.eclipse.help.internal.search.federated;x-friends:="org.eclipse.help.ui",
org.eclipse.help.internal.standalone;x-internal:=true,
org.eclipse.help.internal.workingset;x-friends:="org.eclipse.help.ui,org.eclipse.help.webapp",
+ org.eclipse.help.internal.xhtml;x-friends:="org.eclipse.help.ui",
org.eclipse.help.search,
org.eclipse.help.standalone
Require-Bundle: org.apache.lucene;bundle-version="[1.4.3,2.0.0)",
diff --git a/org.eclipse.help.base/plugin.xml b/org.eclipse.help.base/plugin.xml
index b9b567fbc..a3b11b25a 100644
--- a/org.eclipse.help.base/plugin.xml
+++ b/org.eclipse.help.base/plugin.xml
@@ -168,4 +168,10 @@
participant="org.eclipse.help.internal.search.XHTMLSearchParticipant"/>
</extension>
+ <extension
+ id="dynamic"
+ point="org.eclipse.help.contentProducer">
+ <contentProducer producer="org.eclipse.help.internal.base.DynamicContentProducer"/>
+ </extension>
+
</plugin>
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/DynamicContentProducer.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/DynamicContentProducer.java
index 4d7119565..c755792d5 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/DynamicContentProducer.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/DynamicContentProducer.java
@@ -1,5 +1,5 @@
/***************************************************************************************************
- * Copyright (c) 2005 IBM Corporation and others. All rights reserved. This program and the
+ * Copyright (c) 2006 IBM Corporation and others. All rights reserved. This program and the
* accompanying materials are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
@@ -7,7 +7,7 @@
* Contributors: IBM Corporation - initial API and implementation
**************************************************************************************************/
-package org.eclipse.help.internal;
+package org.eclipse.help.internal.base;
import java.io.IOException;
import java.io.InputStream;
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/XHTMLSearchParticipant.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/XHTMLSearchParticipant.java
index baddad91e..23c5a39a8 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/XHTMLSearchParticipant.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/XHTMLSearchParticipant.java
@@ -9,7 +9,7 @@ import javax.xml.parsers.SAXParserFactory;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
-import org.eclipse.help.internal.DynamicContentProducer;
+import org.eclipse.help.internal.base.DynamicContentProducer;
import org.eclipse.help.search.XMLSearchParticipant;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/AbstractUAElement.java b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/AbstractUAElement.java
index 74e3ce812..1ef7e88d2 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/AbstractUAElement.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/AbstractUAElement.java
@@ -1,5 +1,5 @@
/***************************************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others. All rights reserved. This program and the
+ * Copyright (c) 2004, 2006 IBM Corporation and others. All rights reserved. This program and the
* accompanying materials are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
@@ -75,4 +75,4 @@ public abstract class AbstractUAElement {
-} \ No newline at end of file
+}
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/BundleUtil.java b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/BundleUtil.java
index 6ed738ae2..04c3a4163 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/BundleUtil.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/BundleUtil.java
@@ -1,5 +1,5 @@
/***************************************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others. All rights reserved. This program and the
+ * Copyright (c) 2004, 2006 IBM Corporation and others. All rights reserved. This program and the
* accompanying materials are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/DOMUtil.java b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/DOMUtil.java
index 02b75276e..86a9a1857 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/DOMUtil.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/DOMUtil.java
@@ -1,5 +1,5 @@
/***************************************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others. All rights reserved. This program and the
+ * Copyright (c) 2004, 2006 IBM Corporation and others. All rights reserved. This program and the
* accompanying materials are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/UAContentFilterProcessor.java b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/UAContentFilterProcessor.java
index 326fcfb32..2856b4e2c 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/UAContentFilterProcessor.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/UAContentFilterProcessor.java
@@ -1,5 +1,5 @@
/***************************************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others. All rights reserved. This program and the
+ * Copyright (c) 2004, 2006 IBM Corporation and others. All rights reserved. This program and the
* accompanying materials are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
@@ -43,7 +43,7 @@ public class UAContentFilterProcessor {
if (!filteredIn)
return;
} else if (hasFiltersAsChildren(element)) {
- Element[] filters = DOMUtil.getElementsByTagName(element, "filter");
+ Element[] filters = DOMUtil.getElementsByTagName(element, "filter"); //$NON-NLS-1$
filteredIn = processFilterChildren(element, filters);
if (!filteredIn)
return;
@@ -66,7 +66,7 @@ public class UAContentFilterProcessor {
}
private static boolean hasFiltersAsChildren(Element element) {
- Element[] filters = DOMUtil.getElementsByTagName(element, "filter");
+ Element[] filters = DOMUtil.getElementsByTagName(element, "filter"); //$NON-NLS-1$
if (filters != null && filters.length > 0)
return true;
return false;
@@ -96,8 +96,8 @@ public class UAContentFilterProcessor {
private boolean processFilterChildren(Element parent, Element[] filters) {
boolean filtered_in = false;
for (int i = 0; i < filters.length; i++) {
- String filter = filters[i].getAttribute("name");
- String value = filters[i].getAttribute("value");
+ String filter = filters[i].getAttribute("name"); //$NON-NLS-1$
+ String value = filters[i].getAttribute("value"); //$NON-NLS-1$
filtered_in = isFilteredIn(filter, value);
if (!filtered_in) {
parent.getParentNode().removeChild(parent);
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/UAContentMergeProcessor.java b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/UAContentMergeProcessor.java
index 0965797bb..83f85a33d 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/UAContentMergeProcessor.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/UAContentMergeProcessor.java
@@ -1,5 +1,5 @@
/***************************************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others. All rights reserved. This program and the
+ * Copyright (c) 2004, 2006 IBM Corporation and others. All rights reserved. This program and the
* accompanying materials are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/UAContentParser.java b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/UAContentParser.java
index cb359b794..5a9782d99 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/UAContentParser.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/UAContentParser.java
@@ -1,5 +1,5 @@
/***************************************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others. All rights reserved. This program and the
+ * Copyright (c) 2004, 2006 IBM Corporation and others. All rights reserved. This program and the
* accompanying materials are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/UAInclude.java b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/UAInclude.java
index 2681005b4..c9501ee93 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/UAInclude.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/UAInclude.java
@@ -1,5 +1,5 @@
/***************************************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others. All rights reserved. This program and the
+ * Copyright (c) 2004, 2006 IBM Corporation and others. All rights reserved. This program and the
* accompanying materials are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/UATopicExtension.java b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/UATopicExtension.java
index 74b8b4b33..b92b8816b 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/UATopicExtension.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/UATopicExtension.java
@@ -1,5 +1,5 @@
/***************************************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others. All rights reserved. This program and the
+ * Copyright (c) 2004, 2006 IBM Corporation and others. All rights reserved. This program and the
* accompanying materials are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/UATransformManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/UATransformManager.java
index 965207e69..c5c75c758 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/UATransformManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/UATransformManager.java
@@ -1,5 +1,5 @@
/***************************************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others. All rights reserved. This program and the
+ * Copyright (c) 2004, 2006 IBM Corporation and others. All rights reserved. This program and the
* accompanying materials are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/XHTMLSupport.java b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/XHTMLSupport.java
index a1257afe7..913dd517e 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/xhtml/XHTMLSupport.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/XHTMLSupport.java
@@ -1,5 +1,5 @@
/***************************************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others. All rights reserved. This program and the
+ * Copyright (c) 2004, 2006 IBM Corporation and others. All rights reserved. This program and the
* accompanying materials are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
@@ -9,6 +9,7 @@
package org.eclipse.help.internal.xhtml;
+import org.eclipse.help.internal.base.BaseHelpSystem;
import org.w3c.dom.Document;
@@ -37,8 +38,11 @@ public class XHTMLSupport {
public Document processDOM() {
- // resolve filters.
- filterProcessor.applyFilters(document);
+ // filters do not apply to infocenter
+ if (BaseHelpSystem.getMode() != BaseHelpSystem.MODE_INFOCENTER) {
+ // resolve filters.
+ filterProcessor.applyFilters(document);
+ }
// resolve includes.
mergeProcessor.resolveIncludes();
diff --git a/org.eclipse.help/META-INF/MANIFEST.MF b/org.eclipse.help/META-INF/MANIFEST.MF
index a12eff88f..f99303ff1 100644
--- a/org.eclipse.help/META-INF/MANIFEST.MF
+++ b/org.eclipse.help/META-INF/MANIFEST.MF
@@ -13,7 +13,6 @@ Export-Package: org.eclipse.help,
org.eclipse.help.internal.model;x-friends:="org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help.webapp",
org.eclipse.help.internal.protocols;x-friends:="org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help.webapp",
org.eclipse.help.internal.toc;x-friends:="org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help.webapp",
- org.eclipse.help.internal.util;x-friends:="org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help.webapp",
- org.eclipse.help.internal.xhtml;x-friends:="org.eclipse.help.ui"
+ org.eclipse.help.internal.util;x-friends:="org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help.webapp"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)"
Eclipse-LazyStart: true
diff --git a/org.eclipse.help/plugin.xml b/org.eclipse.help/plugin.xml
index b0cb82473..c376adb5a 100644
--- a/org.eclipse.help/plugin.xml
+++ b/org.eclipse.help/plugin.xml
@@ -7,12 +7,5 @@
<extension-point id="contentProducer" name="%content_producer_extension_point_name" schema="schema/contentProducer.exsd"/>
<extension-point id="index" name="%index_extension_point_name"/>
<extension-point id="contentExtension" name="%content_extension_point_name" schema="schema/contentExtension.exsd"/>
- <extension
- id="dynamic"
- point="org.eclipse.help.contentProducer">
- <contentProducer producer="org.eclipse.help.internal.DynamicContentProducer"/>
- </extension>
-
-
</plugin>

Back to the top