Skip to content
This repository has been archived by the owner on Sep 20, 2020. It is now read-only.

Commit

Permalink
[#75] Remove reference to BrowserTopComponent.settings from layer.xml
Browse files Browse the repository at this point in the history
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
jonas committed Jul 1, 2010
1 parent 95bc69d commit 180f329
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion src/org/nbgit/resources/layer.xml
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion src/org/nbgit/resources/settings.xml
Expand Up @@ -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"/>
Expand Down
2 changes: 1 addition & 1 deletion src/org/nbgit/ui/browser/BrowserTopComponent.java
Expand Up @@ -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) {
Expand Down

0 comments on commit 180f329

Please sign in to comment.