Minor fixes.

dcaoyuan · Apr 18, 2014 · c9ac7b6 · c9ac7b6
1 parent 73f1ce2
commit c9ac7b6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/scala.editor/src/main/resources/org/netbeans/modules/scala/editor/resources/layer.xml b/scala.editor/src/main/resources/org/netbeans/modules/scala/editor/resources/layer.xml
@@ -31,8 +31,6 @@
                         <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.defaults.Bundle"/>
                         <attr name="nbeditor-settings-ColoringType" stringvalue="highlight"/>
                     </file>
-                    <file name="org-netbeans-modules-defaults-token-colorings.xml">
-                    </file>
                 </folder>
             </folder>
             <folder name="SolarizedLight">
@@ -181,8 +179,8 @@
                         <attr name="originalFile" stringvalue="Actions/Scala/org-netbeans-modules-scala-editor-imports-FixImportsAction.instance"/>
                         <attr name="position" intvalue="801"/>
                     </file>
-
                 </folder>
+
                 <folder name="Toolbars">
                     <folder name="Default">
                         <file name="Separator-before-comment.instance">

diff --git a/scala.editor/src/main/scala/org/netbeans/modules/scala/editor/ScalaReformatter.scala b/scala.editor/src/main/scala/org/netbeans/modules/scala/editor/ScalaReformatter.scala
@@ -15,7 +15,6 @@ import org.netbeans.modules.scala.editor.spi.ScalariformPrefsProvider
 import scalariform.formatter.preferences.AlignParameters
 import scalariform.formatter.preferences.AlignSingleLineCaseStatements
 import scalariform.formatter.preferences.FormattingPreferences
-import scalariform.formatter.preferences.IFormattingPreferences
 import scalariform.formatter.preferences.IndentSpaces
 import scalariform.formatter.preferences.RewriteArrowSymbols
 import scalariform.parser.ScalaParserException
@@ -116,6 +115,21 @@ class ScalaReformatter(source: Source, context: Context) extends ReformatTask {
       case _ => null
     }
   }
+
+  /**
+   * @Note should override it:
+   * WARNING [org.netbeans.core.spi.multiview.text.MultiViewCloneableEditor]: Need
+   * to override toString() to contain the file name in o.n.api.action.Savable
+   * class org.netbeans.modules.csl.core.GsfDataObject$GenericEditorSupport$Environment$SaveSupport
+   * with lookup [/home/dcaoyuan/myprjs/nbscala/scala.editor/src/main/scala/org/netbeans/modules/scala/editor/ScalaReformatter.scala@898be162:566f7588,
+   * org.netbeans.modules.csl.core.GsfDataNode[name=ScalaReformatter; displayName=ScalaReformatter.scala]
+   * [Name=ScalaReformatter, displayName=ScalaReformatter.scala],
+   * org.netbeans.modules.csl.core.GsfDataObject@2c6e77c4[/home/dcaoyuan/myprjs/nbscala/scala.editor/src/main/scala/org/netbeans/modules/scala/editor/ScalaReformatter.scala@898be162:566f7588],
+   * org.netbeans.modules.csl.core.GsfDataObject$GenericEditorSupport$Environment$SaveSupport@b6d0d86,
+   * org.netbeans.core.multiview.MultiViewTopComponentLookup$LookupProxyActionMap@22b1d509,
+   * CES: DocumentOpenClose: GenericEditorSupport@1314970463, documentStatus=OPENED, docRef=(GsfDocument@1057563712)]
+   */
+  override def toString = "Scala Reformatter"
 }
 
 object ScalaReformatter {