Changeset 144

Timestamp:

10/15/02 01:02:55 (21 years ago)

Author:

piso

Message:

Moved STATE_ constants from ShellFormatter?.java to Constants.java.

File:

• trunk/j/src/org/armedbear/j/Shell.java (modified) (9 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2002 Peter Graves
- * $Id: Shell.java,v 1.9 2002-10-14 23:38:32 piso Exp $
+ * $Id: Shell.java,v 1.10 2002-10-15 01:02:55 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -85 +85 @@
             promptIsStderr = false;
     }
-    
+
     protected Shell(String shellCommand, Mode mode)
     {
@@ -265 +265 @@
         if (promptRE != null) {
             Line dotLine = editor.getDotLine();
-            if (dotLine.next() == null || dotLine.flags() == ShellFormatter.STATE_INPUT) {
+            if (dotLine.next() == null || dotLine.flags() == STATE_INPUT) {
                 REMatch match = promptRE.getMatch(dotLine.getText());
                 if (match != null)
@@ -435 +435 @@
         }
         if (dotLine.flags() == 0)
-            dotLine.setFlags(ShellFormatter.STATE_INPUT);
+            dotLine.setFlags(STATE_INPUT);
         editor.eol();
         editor.insertLineSeparator();
@@ -583 +583 @@
             final int size = completions.size();
             if (size > 0) {
-                dotLine.setFlags(ShellFormatter.STATE_INPUT);
+                dotLine.setFlags(STATE_INPUT);
                 editor.insertLineSeparator();
                 for (int i = 0; i < size; i++) {
@@ -705 +705 @@
         final Editor editor = Editor.currentEditor();
         if (editor.getDotLine().next() == null)
-            editor.getDotLine().setFlags(ShellFormatter.STATE_INPUT);
+            editor.getDotLine().setFlags(STATE_INPUT);
         try {
             stdin.write(c);
@@ -874 +874 @@
         final Line last = posEndOfOutput.getLine();
         if (isPasswordPrompt(last)) {
-            last.setFlags(ShellFormatter.STATE_PASSWORD_PROMPT);
+            last.setFlags(STATE_PASSWORD_PROMPT);
             return;
         }
@@ -886 +886 @@
             REMatch match = promptRE.getMatch(last.getText());
             if (match != null)
-                nextToLast.setFlags(ShellFormatter.STATE_PROMPT);
+                nextToLast.setFlags(STATE_PROMPT);
         }
     }
@@ -903 +903 @@
     {
         if (isPasswordPrompt(posEndOfOutput.getLine())) {
-            String password = PasswordDialog.showPasswordDialog(Editor.currentEditor(), "Password:", "Password");
+            String password =
+                PasswordDialog.showPasswordDialog(Editor.currentEditor(),
+                                                  "Password:", "Password");
             if (password != null) {
                 try {