minor fixups to avoid less-bad warnings
diff --git a/bundles/org.eclipse.jst.jsp.core/.classpath b/bundles/org.eclipse.jst.jsp.core/.classpath
index 79062d4..0342a21 100644
--- a/bundles/org.eclipse.jst.jsp.core/.classpath
+++ b/bundles/org.eclipse.jst.jsp.core/.classpath
@@ -4,8 +4,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/jst/**"/>
- <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/css/core/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/sse/core/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/xml/core/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/html/core/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/validation/**"/>
+ <!-- SSE UI? How'd that happend?! -->
+ <accessrule kind="accessible" pattern="org/eclipse/wst/sse/ui/**"/>
</accessrules>
</classpathentry>
<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.wst.css.core/.classpath b/bundles/org.eclipse.wst.css.core/.classpath
index cb01053..75d941e 100644
--- a/bundles/org.eclipse.wst.css.core/.classpath
+++ b/bundles/org.eclipse.wst.css.core/.classpath
@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry path="src" kind="src"/>
+ <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>
+ <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
+ <accessrules>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/sse/core/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/xml/core/**"/>
+ </accessrules>
+ </classpathentry>
+ <classpathentry path="bin" kind="output"/>
</classpath>
diff --git a/bundles/org.eclipse.wst.css.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.css.core/.settings/org.eclipse.jdt.core.prefs
index 5f7bac7..242a791 100644
--- a/bundles/org.eclipse.wst.css.core/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.wst.css.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Sat Aug 19 16:31:43 EDT 2006
+#Sun Aug 20 00:49:11 EDT 2006
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -25,11 +25,12 @@
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=ignore
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
@@ -51,6 +52,7 @@
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
diff --git a/bundles/org.eclipse.wst.css.ui/.classpath b/bundles/org.eclipse.wst.css.ui/.classpath
index cb01053..fc1d9ed 100644
--- a/bundles/org.eclipse.wst.css.ui/.classpath
+++ b/bundles/org.eclipse.wst.css.ui/.classpath
@@ -1,7 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry path="src" kind="src"/>
+ <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>
+ <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
+ <accessrules>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/css/core/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/sse/core/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/sse/ui/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/sse/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/xml/core/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/xml/ui/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/html/core/**"/>
+ </accessrules>
+ </classpathentry>
+ <classpathentry path="bin" kind="output"/>
</classpath>
diff --git a/bundles/org.eclipse.wst.html.core/.classpath b/bundles/org.eclipse.wst.html.core/.classpath
index cb01053..844a52c 100644
--- a/bundles/org.eclipse.wst.html.core/.classpath
+++ b/bundles/org.eclipse.wst.html.core/.classpath
@@ -2,6 +2,18 @@
<classpath>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
+ <accessrules>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/css/core/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/sse/core/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/sse/ui/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/sse/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/xml/core/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/xml/ui/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/html/core/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/common/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/validation/**"/>
+ </accessrules>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.wst.html.ui/.classpath b/bundles/org.eclipse.wst.html.ui/.classpath
index d7ce462..ad09ce8 100644
--- a/bundles/org.eclipse.wst.html.ui/.classpath
+++ b/bundles/org.eclipse.wst.html.ui/.classpath
@@ -3,6 +3,18 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src-html-validation"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
+ <accessrules>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/css/core/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/sse/core/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/sse/ui/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/sse/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/xml/core/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/xml/ui/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/html/core/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/validation/**"/>
+ <accessrule kind="accessible" pattern="org/eclipse/wst/css/ui/**"/>
+ </accessrules>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/CommonMultiPageEditor.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/CommonMultiPageEditor.java
index ddb0cf6..44fad32 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/CommonMultiPageEditor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/CommonMultiPageEditor.java
@@ -32,6 +32,7 @@
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
@@ -52,8 +53,6 @@
import org.eclipse.ui.forms.widgets.ImageHyperlink;
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.internal.IWorkbenchGraphicConstants;
-import org.eclipse.ui.internal.WorkbenchImages;
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.part.MultiPageEditorPart;
import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
@@ -61,6 +60,7 @@
import org.eclipse.wst.sse.ui.StructuredTextEditor;
import org.eclipse.wst.xsd.ui.internal.adt.design.FlatCCombo;
import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.RootEditPart;
+import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
public abstract class CommonMultiPageEditor extends MultiPageEditorPart implements IResourceChangeListener, CommandStackListener, ITabbedPropertySheetPageContributor, IPropertyListener, IEditorModeListener
{
@@ -582,7 +582,9 @@
ImageHyperlink hyperlink = new ImageHyperlink(toolbar, SWT.FLAT);
hyperlink.setBackground(ColorConstants.white);
- hyperlink.setImage(WorkbenchImages.getImageRegistry().get(IWorkbenchGraphicConstants.IMG_ETOOL_HELP_CONTENTS));
+ Image image = XSDEditorPlugin.getDefault().getImage("icons/elcl16/showproperties_obj.gif");
+ hyperlink.setImage(image);
+// hyperlink.setImage(WorkbenchImages.getImageRegistry().get(IWorkbenchGraphicConstants.IMG_ETOOL_HELP_CONTENTS));
hyperlink.setToolTipText(Messages._UI_HOVER_VIEW_MODE_DESCRIPTION);
hyperlink.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_CENTER));
}
