Skip to content

Commit

Permalink
Fix open error item in "ECMAScript built-in library"
Browse files Browse the repository at this point in the history
  • Loading branch information
cypher256 committed Jan 19, 2018
1 parent 200f0a7 commit 564cbb2
Show file tree
Hide file tree
Showing 15 changed files with 45 additions and 37 deletions.
Binary file modified docs/artifacts.jar
Binary file not shown.
Binary file modified docs/content.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<description name="Autodetect Encoding Update Site" url="https://cypher256.github.io/eclipse-encoding-plugin/">
An update site for Autodetect Encoding Eclipse Plugin.
</description>
<feature url="features/eclipse.encoding.plugin.feature_1.8.4.201708052053.jar" id="eclipse.encoding.plugin.feature" version="1.8.4.201708052053">
<feature url="features/eclipse.encoding.plugin.feature_1.8.5.201801191409.jar" id="eclipse.encoding.plugin.feature" version="1.8.5.201801191409">
<category name="eclipse.encoding.plugin.category"/>
</feature>
<category-def name="eclipse.encoding.plugin.category" label="Autodetect Encoding"/>
Expand Down
62 changes: 31 additions & 31 deletions eclipse.encoding.feature/feature.xml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="eclipse.encoding.plugin.feature"
label="Autodetect Encoding"
version="1.8.4.qualifier"
provider-name="Shinji Kashihara">

<description url="https://github.com/cypher256/eclipse-encoding-plugin">
Displays information about the open editor file in the eclipse status bar.
</description>

<copyright>
Copyright (c) 2016- Shinji Kashihara and others. All rights reserved.
</copyright>

<license url="https://www.eclipse.org/legal/epl-v10.html">
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="eclipse.encoding.plugin.feature"
label="Autodetect Encoding"
version="1.8.5.qualifier"
provider-name="Shinji Kashihara">

<description url="https://github.com/cypher256/eclipse-encoding-plugin">
Displays information about the open editor file in the eclipse status bar.
</description>

<copyright>
Copyright (c) 2016- Shinji Kashihara and others. All rights reserved.
</copyright>

<license url="https://www.eclipse.org/legal/epl-v10.html">
Eclipse Public License - v 1.0

THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT.
Expand Down Expand Up @@ -100,18 +100,18 @@ All Recipient&apos;s rights under this Agreement shall terminate if it fails to

Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.

This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
</license>

<url>
<update label="Autodetect Encoding Plugin Update Site" url="https://cypher256.github.io/eclipse-encoding-plugin/"/>
</url>

<plugin
id="mergedoc.encoding"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
</license>

<url>
<update label="Autodetect Encoding Plugin Update Site" url="https://cypher256.github.io/eclipse-encoding-plugin/"/>
</url>

<plugin
id="mergedoc.encoding"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
2 changes: 1 addition & 1 deletion eclipse.encoding.plugin/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Autodetect Encoding
Bundle-SymbolicName: mergedoc.encoding;singleton:=true
Bundle-Version: 1.8.4.qualifier
Bundle-Version: 1.8.5.qualifier
Bundle-Activator: mergedoc.encoding.Activator
Bundle-Vendor: Shinji Kashihara
Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ private ActiveDocument getDocument(IEditorPart editor) {
// No opened editor in workspace
return new NonOpenedDocument();
}

if (editor.getAdapter(IEncodingSupport.class) != null) {

// Get MultiPartEditor active tab (plugin.xml MANIFEST.MF tab, etc...)
Expand Down Expand Up @@ -123,12 +123,20 @@ else if (editorInput instanceof IStorageEditorInput) {
// Fallback
Activator.info("No Content: " + editorInput.getClass().getName());
return new ActiveDocument(editor, callback);
} else if (editorInput.getClass().getSimpleName().equals("InternalClassFileEditorInput")) {
}
/*
[Issue] IllegalStateException thrown when JavaScript resource is opened #9
Seems confused with
org.eclipse.jdt.internal.ui.javaeditor.InternalClassFileEditorInput (Java editor)
org.eclipse.wst.jsdt.internal.ui.javaeditor.InternalClassFileEditorInput (JavaScript editor)
*/
//else if (editorInput.getClass().getSimpleName().equals("InternalClassFileEditorInput")) {
else if (editorInput.getClass().getName().equals("org.eclipse.jdt.internal.ui.javaeditor.InternalClassFileEditorInput")) {
// Class file in jar (with source and without source)
return new ClassFileJarDocument(editor, callback);
}
}

// MultiPageEditor no document tab (plugin.xml overview tab, etc...)
return new NullDocument(editor);
}
Expand Down
Binary file modified eclipse.encoding.updatesite.snapshot/artifacts.jar
Binary file not shown.
Binary file modified eclipse.encoding.updatesite.snapshot/content.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion eclipse.encoding.updatesite.snapshot/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<description name="Autodetect Encoding Update Site Snapshot" url="https://raw.githubusercontent.com/cypher256/eclipse-encoding-plugin/master/eclipse.encoding.updatesite.snapshot/site.xml">
An update site snapshot for Autodetect Encoding Eclipse Plugin.
</description>
<feature url="features/eclipse.encoding.plugin.feature_1.8.4.201708052053.jar" id="eclipse.encoding.plugin.feature" version="1.8.4.201708052053">
<feature url="features/eclipse.encoding.plugin.feature_1.8.5.201801191359.jar" id="eclipse.encoding.plugin.feature" version="1.8.5.201801191359">
<category name="eclipse.encoding.plugin.category"/>
</feature>
<category-def name="eclipse.encoding.plugin.category" label="Autodetect Encoding"/>
Expand Down

0 comments on commit 564cbb2

Please sign in to comment.