Changeset 10995

Timestamp:

02/18/06 17:36:30 (18 years ago)

Author:

piso

Message:

Indentation.

File:

• trunk/j/src/org/armedbear/j/CppMode.java (modified) (2 diffs)

trunk/j/src/org/armedbear/j/CppMode.java

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2006 Peter Graves
- * $Id: CppMode.java,v 1.3 2006-01-31 10:06:23 piso Exp $
+ * $Id: CppMode.java,v 1.4 2006-02-18 17:36:30 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -95 +95 @@
         if (trim.equals("public:") || trim.equals("private:") || trim.equals("protected:"))
             return 0;
-        if (trim.startsWith(": ") || trim.startsWith(":\t"))
-            return 2; // start of member initialization list
+        Line model = findModel(line);
+        if (model == null)
+            return 0;
+        if (trim.startsWith(": ") || trim.startsWith(":\t")) {
+            // start of member initialization list
+            return model.getIndentation() + 2;
+        }
         if (trim.startsWith("{")) {
-            Line model = findModel(line);
-            if (model == null)
-                return 0;
             String modelTrim = model.trim();
             if (modelTrim.startsWith(": ") || modelTrim.startsWith(":\t"))