Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[#75] Remove reference to BrowserTopComponent.settings from layer.xml

The missing file breaks Rails debugging reporting the following message:

  Caused: java.io.FileNotFoundException: jar:file:/.../org-nbgit.jar!/org/nbgit/resources/BrowserTopComponentSettings.xml
    at org.netbeans.JarClassLoader$ResURLConnection.connect(JarClassLoader.java:870)
    at org.netbeans.JarClassLoader$ResURLConnection.getInputStream(JarClassLoader.java:906)
    at org.netbeans.core.startup.layers.BinaryFS$BFSFile.getInputStream(BinaryFS.java:736)
  Caused: java.io.FileNotFoundException

The change should not alter anything, since the component was not
persisted before either.

Also update the gitversioning .settings files to version 0.4 and give
the BrowserTopComponent class a more unique ID: org-nbgit-ui-browser.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
  • Loading branch information...
commit 180f329511e0b694a8ad4281cd21598d57953bd9 1 parent 95bc69d
@jonas jonas authored
View
1  src/org/nbgit/resources/layer.xml
@@ -72,7 +72,6 @@ made subject to such option by the copyright holder.
<folder name="Windows2">
<folder name="Components">
- <file name="BrowserTopComponent.settings" url="BrowserTopComponentSettings.xml"/>
<file name="gitversioning.settings" url="settings.xml"/>
</folder>
<folder name="Modes">
View
2  src/org/nbgit/resources/settings.xml
@@ -42,7 +42,7 @@ made subject to such option by the copyright holder.
-->
<!DOCTYPE settings PUBLIC "-//NetBeans//DTD Session settings 1.0//EN" "http://www.netbeans.org/dtds/sessionsettings-1_0.dtd">
<settings version="1.0">
- <module name="org.nbgit" spec="0.3"/>
+ <module name="org.nbgit" spec="0.4"/>
<instanceof class="org.openide.windows.TopComponent"/>
<instanceof class="org.nbgit.ui.status.GitVersioningTopComponent"/>
<instance class="org.nbgit.ui.status.GitVersioningTopComponent" method="getDefault"/>
View
2  src/org/nbgit/ui/browser/BrowserTopComponent.java
@@ -53,7 +53,7 @@
public final class BrowserTopComponent extends TopComponent {
private static final String ICON_PATH = "org/nbgit/resources/icons/gitvcs-icon.png"; // NOI18N
- private static final String PREFERRED_ID = "BrowserTopComponent"; // NOI18N
+ private static final String PREFERRED_ID = "org-nbgit-ui-browser"; // NOI18N
private int commitIndex = -1;
public BrowserTopComponent(BrowserModel model) {
Please sign in to comment.
Something went wrong with that request. Please try again.