1.1 --- a/gsf/nbproject/project.xml Mon Mar 26 11:04:08 2012 -0400
1.2 +++ b/gsf/nbproject/project.xml Tue Mar 27 14:32:38 2012 -0400
1.3 @@ -284,7 +284,7 @@
1.4 <build-prerequisite/>
1.5 <compile-dependency/>
1.6 <run-dependency>
1.7 - <specification-version>7.19</specification-version>
1.8 + <specification-version>7.55</specification-version>
1.9 </run-dependency>
1.10 </dependency>
1.11 <dependency>
2.1 --- a/gsf/src/org/netbeans/modules/gsf/LanguageRegistry.java Mon Mar 26 11:04:08 2012 -0400
2.2 +++ b/gsf/src/org/netbeans/modules/gsf/LanguageRegistry.java Tue Mar 27 14:32:38 2012 -0400
2.3 @@ -619,20 +619,8 @@
2.4 return;
2.5 }
2.6
2.7 - String userDir = System.getProperty("netbeans.user"); // NOI18N
2.8 - if (userDir == null) {
2.9 - return;
2.10 - }
2.11 -
2.12 -
2.13 - FileObject config = FileUtil.toFileObject(new File(userDir, "config")); // NOI18N
2.14 -
2.15 - if (config == null) {
2.16 - return;
2.17 - }
2.18 -
2.19 - FileObject navFo = config.getFileObject("Navigator/Panels/text/javascript/org-netbeans-modules-gsfret-navigation-ClassMemberPanel.instance"); // NOI18N
2.20 - if (navFo == null) {
2.21 + FileObject navFo = FileUtil.getConfigFile("Navigator/Panels/text/javascript/org-netbeans-modules-gsfret-navigation-ClassMemberPanel.instance"); // NOI18N
2.22 + if (navFo == null || !navFo.canRevert()) {
2.23 // We've already done the cleanup.
2.24 // (text/javascript is in all configurations of the IDE, so if
2.25 // the text/javascript folder is gone, so are all the others
2.26 @@ -640,7 +628,7 @@
2.27 }
2.28
2.29 try {
2.30 - FileObject navigator = config.getFileObject("Navigator"); // NOI18N
2.31 + FileObject navigator = FileUtil.getConfigFile("Navigator"); // NOI18N
2.32 if (navigator != null) {
2.33 FileObject panels = navigator.getFileObject("Panels"); // NOI18N
2.34 if (panels != null) {
2.35 @@ -648,20 +636,20 @@
2.36 for (FileObject innerMime : outerMime.getChildren()) {
2.37 FileObject panel = innerMime.getFileObject("org-netbeans-modules-gsfret-navigation-ClassMemberPanel.instance"); // NOI18N
2.38 if (panel != null) {
2.39 - panel.delete();
2.40 + panel.revert();
2.41 if (innerMime.getChildren().length == 0) {
2.42 - innerMime.delete();
2.43 + innerMime.revert();
2.44 }
2.45 }
2.46 if (outerMime.getChildren().length == 0) {
2.47 - outerMime.delete();
2.48 + outerMime.revert();
2.49 }
2.50 }
2.51 }
2.52 if (panels.getChildren().length == 0) {
2.53 - panels.delete();
2.54 + panels.revert();
2.55 if (navigator.getChildren().length == 0) {
2.56 - navigator.delete();
2.57 + navigator.revert();
2.58 }
2.59 }
2.60 }
2.61 @@ -669,7 +657,7 @@
2.62
2.63
2.64 // Delete editors stuff
2.65 - FileObject editors = config.getFileObject("Editors"); // NOI18N
2.66 + FileObject editors = FileUtil.getConfigFile("Editors"); // NOI18N
2.67 if (editors != null) {
2.68 for (FileObject outerMime : editors.getChildren()) {
2.69 for (FileObject innerMime : outerMime.getChildren()) {
2.70 @@ -680,47 +668,47 @@
2.71 // Clean up the settings files
2.72 FileObject settings = root.getFileObject("Settings.settings"); // NOI18N
2.73 if (settings != null) {
2.74 - settings.delete();
2.75 + settings.revert();
2.76 }
2.77
2.78 // init code folding bar
2.79 FileObject fo = root.getFileObject("SideBar/org-netbeans-modules-editor-gsfret-GsfCodeFoldingSideBarFactory.instance");
2.80 if (fo != null) {
2.81 - fo.delete();
2.82 + fo.revert();
2.83 }
2.84 fo = root.getFileObject("SideBar");
2.85 if (fo != null && fo.getChildren().length == 0) {
2.86 - fo.delete();
2.87 + fo.revert();
2.88 }
2.89 fo = root.getFileObject("FoldManager/org-netbeans-modules-gsfret-editor-fold-GsfFoldManagerFactory.instance");
2.90 if (fo != null) {
2.91 - fo.delete();
2.92 + fo.revert();
2.93 }
2.94 fo = root.getFileObject("FoldManager");
2.95 if (fo != null && fo.getChildren().length == 0) {
2.96 - fo.delete();
2.97 + fo.revert();
2.98 }
2.99
2.100 // YAML cleanup: Was a Schliemann editor in 6.0/6.1/6.5dev so may have to delete its persistent system files
2.101 if (mimeType.equals("text/x-yaml") || mimeType.equals("text/x-json")) { // NOI18N
2.102 FileObject f = root.getFileObject("Popup/generate-fold-popup"); // NOI18N
2.103 if (f != null) {
2.104 - f.delete();
2.105 + f.revert();
2.106 f = root.getFileObject("ToolTips/org-netbeans-modules-languages-features-ToolTipAnnotation.instance"); // NOI18N
2.107 if (f != null) {
2.108 - f.delete();
2.109 + f.revert();
2.110 }
2.111 f = root.getFileObject("Popup/org-netbeans-modules-languages-features-GoToDeclarationAction.instance"); // NOI18N
2.112 if (f != null) {
2.113 - f.delete();
2.114 + f.revert();
2.115 }
2.116 f = root.getFileObject("UpToDateStatusProvider/org-netbeans-modules-languages-features-UpToDateStatusProviderFactoryImpl.instance"); // NOI18N
2.117 if (f != null) {
2.118 - f.delete();
2.119 + f.revert();
2.120 }
2.121 f = root.getFileObject("run_script.instance"); // NOI18N
2.122 if (f != null) {
2.123 - f.delete();
2.124 + f.revert();
2.125 }
2.126 }
2.127 }
2.128 @@ -729,21 +717,21 @@
2.129 FileObject oldSidebar = root.getFileObject("SideBar/org-netbeans-modules-editor-retouche-GsfCodeFoldingSideBarFactory.instance");
2.130
2.131 if (oldSidebar != null) {
2.132 - oldSidebar.delete();
2.133 + oldSidebar.revert();
2.134 oldSidebar = root.getFileObject("FoldManager/org-netbeans-modules-retouche-editor-fold-GsfFoldManagerFactory.instance");
2.135 if (oldSidebar != null) {
2.136 - oldSidebar.delete();
2.137 + oldSidebar.revert();
2.138 }
2.139 }
2.140
2.141 // init hyperlink provider
2.142 FileObject hyperlinkProvider = root.getFileObject("HyperlinkProviders/GsfHyperlinkProvider.instance");
2.143 if (hyperlinkProvider != null) {
2.144 - hyperlinkProvider.delete();
2.145 + hyperlinkProvider.revert();
2.146 }
2.147 fo = root.getFileObject("HyperlinkProviders");
2.148 if (fo != null && fo.getChildren().length == 0) {
2.149 - fo.delete();
2.150 + fo.revert();
2.151 }
2.152
2.153 // Context menu
2.154 @@ -755,76 +743,76 @@
2.155 // items, so the layer will contain Popup already
2.156 FileObject ref = popup.getFileObject("in-place-refactoring");
2.157 if (ref != null) {
2.158 - ref.delete();
2.159 + ref.revert();
2.160 }
2.161
2.162 FileObject gotoF = popup.getFileObject("goto");
2.163 if (gotoF != null) {
2.164 fo = gotoF.getFileObject("goto-declaration");
2.165 if (fo != null) {
2.166 - fo.delete();
2.167 + fo.revert();
2.168 }
2.169 fo = gotoF.getFileObject("goto");
2.170 if (fo != null) {
2.171 - fo.delete();
2.172 + fo.revert();
2.173 }
2.174 if (gotoF.getChildren().length == 0) {
2.175 - gotoF.delete();
2.176 + gotoF.revert();
2.177 }
2.178 }
2.179 fo = popup.getFileObject("SeparatorBeforeCut.instance");
2.180 if (fo != null) {
2.181 - fo.delete();
2.182 + fo.revert();
2.183 }
2.184 fo = popup.getFileObject("format");
2.185 if (fo != null) {
2.186 - fo.delete();
2.187 + fo.revert();
2.188 }
2.189 fo = popup.getFileObject("SeparatorAfterFormat.instance");
2.190 if (fo != null) {
2.191 - fo.delete();
2.192 + fo.revert();
2.193 }
2.194 fo = popup.getFileObject("pretty-print");
2.195 if (fo != null) {
2.196 - fo.delete();
2.197 + fo.revert();
2.198 }
2.199 fo = popup.getFileObject("generate-goto-popup");
2.200 if (fo != null) {
2.201 - fo.delete();
2.202 + fo.revert();
2.203 }
2.204 if (popup.getChildren().length == 0) {
2.205 - popup.delete();
2.206 + popup.revert();
2.207 }
2.208 }
2.209
2.210 // Service to show if file is compileable or not
2.211 fo = root.getFileObject("UpToDateStatusProvider/org-netbeans-modules-gsfret-hints-GsfUpToDateStateProviderFactory.instance");
2.212 if (fo != null) {
2.213 - fo.delete();
2.214 + fo.revert();
2.215 }
2.216 fo = root.getFileObject("UpToDateStatusProvider/org-netbeans-modules-retouche-hints-GsfUpToDateStateProviderFactory.instance");
2.217 if (fo != null) {
2.218 - fo.delete();
2.219 + fo.revert();
2.220 }
2.221
2.222 // I'm not sure what this is used for - perhaps to turn orange when there are unused imports etc.
2.223 fo = root.getFileObject("UpToDateStatusProvider/org-netbeans-modules-gsfret-editor-semantic-OccurrencesMarkProviderCreator.instance");
2.224 if (fo != null) {
2.225 - fo.delete();
2.226 + fo.revert();
2.227 }
2.228 fo = root.getFileObject("UpToDateStatusProvider/org-netbeans-modules-retouche-editor-semantic-OccurrencesMarkProviderCreator.instance");
2.229 if (fo != null) {
2.230 - fo.delete();
2.231 + fo.revert();
2.232 }
2.233 fo = root.getFileObject("UpToDateStatusProvider");
2.234 if (fo != null && fo.getChildren().length == 0) {
2.235 - fo.delete();
2.236 + fo.revert();
2.237 }
2.238
2.239 // Highlighting layers
2.240 fo = root.getFileObject("org-netbeans-modules-gsfret-editor-semantic-HighlightsLayerFactoryImpl.instance");
2.241 if (fo != null) {
2.242 - fo.delete();
2.243 + fo.revert();
2.244 }
2.245
2.246 // Code completion
2.247 @@ -835,80 +823,80 @@
2.248 String templates = "org-netbeans-lib-editor-codetemplates-CodeTemplateCompletionProvider.instance";
2.249 FileObject templeteProvider = root.getFileObject(completionProviders + "/" + templates);
2.250 if (templeteProvider != null) {
2.251 - templeteProvider.delete();
2.252 + templeteProvider.revert();
2.253 }
2.254 String provider = "org-netbeans-modules-gsfret-editor-completion-GsfCompletionProvider.instance";
2.255 FileObject completionProvider = root.getFileObject(completionProviders + "/" + provider);
2.256 if (completionProvider != null) {
2.257 - completionProvider.delete();
2.258 + completionProvider.revert();
2.259 }
2.260
2.261 FileObject old = completion.getFileObject("org-netbeans-modules-retouche-editor-completion-GsfCompletionProvider.instance");
2.262 if (old != null) {
2.263 - old.delete();
2.264 + old.revert();
2.265 }
2.266 if (completion.getChildren().length == 0) {
2.267 - completion.delete();
2.268 + completion.revert();
2.269 }
2.270 }
2.271
2.272 // Editor toolbar: commenting and uncommenting actions
2.273 fo = root.getFileObject("Toolbars/Default/comment");
2.274 if (fo != null) {
2.275 - fo.delete();
2.276 + fo.revert();
2.277 }
2.278 fo = root.getFileObject("Toolbars/Default/uncomment");
2.279 if (fo != null) {
2.280 - fo.delete();
2.281 + fo.revert();
2.282 }
2.283 FileObject sep = root.getFileObject("Toolbars/Default/Separator-before-comment.instance");
2.284 if (sep != null) {
2.285 - sep.delete();
2.286 + sep.revert();
2.287 }
2.288 fo = root.getFileObject("Toolbars/Default");
2.289 if (fo != null && fo.getChildren().length == 0) {
2.290 - fo.delete();
2.291 + fo.revert();
2.292 fo = root.getFileObject("Toolbars");
2.293 if (fo != null && fo.getChildren().length == 0) {
2.294 - fo.delete();
2.295 + fo.revert();
2.296 }
2.297 }
2.298
2.299 // init code templates
2.300 fo = root.getFileObject("CodeTemplateProcessorFactories/org-netbeans-modules-gsfret-editor-codetemplates-GsfCodeTemplateProcessor$Factory.instance");
2.301 if (fo != null) {
2.302 - fo.delete();
2.303 + fo.revert();
2.304 }
2.305 FileObject old = root.getFileObject("CodeTemplateProcessorFactories/org-netbeans-modules-retouche-editor-codetemplates-GsfCodeTemplateProcessor$Factory.instance");
2.306 if (old != null) {
2.307 - old.delete();
2.308 + old.revert();
2.309 }
2.310 fo = root.getFileObject("CodeTemplateProcessorFactories");
2.311 if (fo != null && fo.getChildren().length == 0) {
2.312 - fo.delete();
2.313 + fo.revert();
2.314 }
2.315
2.316 // init code templates filters
2.317 fo = root.getFileObject("CodeTemplateFilterFactories/org-netbeans-modules-gsfret-editor-codetemplates-GsfCodeTemplateFilter$Factory.instance");
2.318 if (fo != null) {
2.319 - fo.delete();
2.320 + fo.revert();
2.321 }
2.322 old = root.getFileObject("CodeTemplateFilterFactories/org-netbeans-modules-retouche-editor-codetemplates-GsfCodeTemplateFilter$Factory.instance");
2.323 if (old != null) {
2.324 - old.delete();
2.325 + old.revert();
2.326 }
2.327 fo = root.getFileObject("CodeTemplateFilterFactories");
2.328 if (fo != null && fo.getChildren().length == 0) {
2.329 - fo.delete();
2.330 + fo.revert();
2.331 }
2.332
2.333 if (innerMime.getChildren().length == 0) {
2.334 - innerMime.delete();
2.335 + innerMime.revert();
2.336 }
2.337 }
2.338
2.339 if (outerMime.getChildren().length == 0) {
2.340 - outerMime.delete();
2.341 + outerMime.revert();
2.342 }
2.343 }
2.344 }