# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: /home/hmichel/projetos/netbeans/main # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: cnd.editor/src/org/netbeans/modules/cnd/editor/resources/cplusplus/SAMPLE_AlignBraces.cpp --- cnd.editor/src/org/netbeans/modules/cnd/editor/resources/cplusplus/SAMPLE_AlignBraces.cpp Base (BASE) +++ cnd.editor/src/org/netbeans/modules/cnd/editor/resources/cplusplus/SAMPLE_AlignBraces.cpp Locally Modified (Based On LOCAL) @@ -1,4 +1,4 @@ -class ClassA : InterfaceA, InterfaceB, IntefaceC { +class ClassA : InterfaceA, InterfaceB, InterfaceC { public: int number = 1; private: Index: cnd.editor/src/org/netbeans/modules/cnd/editor/resources/cplusplus/SAMPLE_TabsIndents.cpp --- cnd.editor/src/org/netbeans/modules/cnd/editor/resources/cplusplus/SAMPLE_TabsIndents.cpp Base (BASE) +++ cnd.editor/src/org/netbeans/modules/cnd/editor/resources/cplusplus/SAMPLE_TabsIndents.cpp Locally Modified (Based On LOCAL) @@ -2,7 +2,7 @@ /* */ namespace A{ -class ClassA : InterfaceA, InterfaceB, IntefaceC { \ No newline at end of file +class ClassA : InterfaceA, InterfaceB, InterfaceC { \ No newline at end of file public: int number; enum inner { Index: cnd.editor/test/unit/src/org/netbeans/modules/cnd/editor/cplusplus/FormatterTestCase.java --- cnd.editor/test/unit/src/org/netbeans/modules/cnd/editor/cplusplus/FormatterTestCase.java Base (BASE) +++ cnd.editor/test/unit/src/org/netbeans/modules/cnd/editor/cplusplus/FormatterTestCase.java Locally Modified (Based On LOCAL) @@ -3158,7 +3158,7 @@ public void testArrayAsParameter() { setDefaultsOptions(); setLoadDocumentText( - "class ClassA : InterfaceA, InterfaceB, IntefaceC\n" + + "class ClassA : InterfaceA, InterfaceB, InterfaceC\n" + "{\n" + "public:\n" + " int number;\n" + @@ -3170,7 +3170,7 @@ ); reformat(); assertDocumentText("Incorrect formatting of array as parameter", - "class ClassA : InterfaceA, InterfaceB, IntefaceC\n" + + "class ClassA : InterfaceA, InterfaceB, InterfaceC\n" + "{\n" + "public:\n" + " int number;\n" + @@ -3190,7 +3190,7 @@ setLoadDocumentText( "namespace AC\n" + "{\n" + - "class ClassA : InterfaceA, InterfaceB, IntefaceC\n" + + "class ClassA : InterfaceA, InterfaceB, InterfaceC\n" + "{\n" + "public:\n" + " int number;\n" + @@ -3206,7 +3206,7 @@ "namespace AC\n" + "{\n" + "\n" + - "class ClassA : InterfaceA, InterfaceB, IntefaceC\n" + \ No newline at end of file + "class ClassA : InterfaceA, InterfaceB, InterfaceC\n" + \ No newline at end of file "{\n" + "public:\n" + " int number;\n" + Index: java.source/src/org/netbeans/modules/java/ui/Bundle.properties --- java.source/src/org/netbeans/modules/java/ui/Bundle.properties Base (BASE) +++ java.source/src/org/netbeans/modules/java/ui/Bundle.properties Locally Modified (Based On LOCAL) @@ -226,7 +226,7 @@ public void method(String text, int number) {\ } } -SAMPLE_TabsIndents=public class ClassA extends Object implements InterfaceA, InterfaceB, IntefaceC {\ +SAMPLE_TabsIndents=public class ClassA extends Object implements InterfaceA, InterfaceB, InterfaceC {\ public int number = 1;\ private String letters[] = new String[]{ "A", "B", "C", "D" };\ public int method(String text, int number) {\ @@ -251,7 +251,7 @@ } } SAMPLE_AlignBraces=@Anno(paramA="a Value", paramB="bValue")\ -public class ClassA extends Object implements InterfaceA, InterfaceB, IntefaceC {\ +public class ClassA extends Object implements InterfaceA, InterfaceB, InterfaceC {\ public int number = 1;\ private String letters[] = new String[]{ "A", "B", "C", "D" };\ public ClassA() {\ Index: php.editor/src/org/netbeans/modules/php/editor/indent/Bundle.properties --- php.editor/src/org/netbeans/modules/php/editor/indent/Bundle.properties Base (BASE) +++ php.editor/src/org/netbeans/modules/php/editor/indent/Bundle.properties Locally Modified (Based On LOCAL) @@ -107,7 +107,7 @@ public void method(String text, int number) {\ } } -SAMPLE_TabsIndents=public class ClassA extends Object implements InterfaceA, InterfaceB, IntefaceC {\ +SAMPLE_TabsIndents=public class ClassA extends Object implements InterfaceA, InterfaceB, InterfaceC {\ public int number = 1;\ private String letters[] = new String[]{ "A", "B", "C", "D" };\ public int method(String text, int number) {\ @@ -132,7 +132,7 @@ } } SAMPLE_AlignBraces=@Anno(paramA="a Value", paramB="bValue")\ -public class ClassA extends Object implements InterfaceA, InterfaceB, IntefaceC {\ +public class ClassA extends Object implements InterfaceA, InterfaceB, InterfaceC {\ public int number = 1;\ private String letters[] = new String[]{ "A", "B", "C", "D" };\ public ClassA() {\ Index: python.editor/src/org/netbeans/modules/python/editor/options/Bundle.properties --- python.editor/src/org/netbeans/modules/python/editor/options/Bundle.properties Base (BASE) +++ python.editor/src/org/netbeans/modules/python/editor/options/Bundle.properties Locally Modified (Based On LOCAL) @@ -214,7 +214,7 @@ # options. It is highly discourage to localize them unless absolutely necessary. SAMPLE_Default=public class ClassA extends Object implements InterfaceA, InterfaceB, InterfaceC -SAMPLE_TabsIndents=public class ClassA extends Object implements InterfaceA, InterfaceB, IntefaceC { +SAMPLE_TabsIndents=public class ClassA extends Object implements InterfaceA, InterfaceB, InterfaceC { SAMPLE_AlignBraces=@Anno(paramA="a Value", paramB="bValue")\n SAMPLE_Wrapping=@Anno(paramA="a Value", paramB="bValue") SAMPLE_BlankLines=package org.netbeans.samples;