Changeset 10135


Ignore:
Timestamp:
10/17/05 16:45:20 (16 years ago)
Author:
piso
Message:

Removed Utilities.isPlatformWindows() and Utilities.isPlatformUnix(). Use static fields instead.

Location:
trunk/j/src/org/armedbear/lisp
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/j/src/org/armedbear/lisp/Interpreter.java

    r10132 r10135  
    33 *
    44 * Copyright (C) 2002-2005 Peter Graves
    5  * $Id: Interpreter.java,v 1.92 2005-10-17 15:44:44 piso Exp $
     5 * $Id: Interpreter.java,v 1.93 2005-10-17 16:45:19 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    7171                out._finishOutput();
    7272            }
    73             if (Utilities.isPlatformUnix()) {
     73            if (Utilities.isPlatformUnix) {
    7474                try {
    7575                    System.loadLibrary("abcl");
     
    224224                return;
    225225            }
    226             if (Utilities.isPlatformWindows()) {
     226            if (Utilities.isPlatformWindows) {
    227227                file = new File("C:\\.abclrc");
    228228                if (file.isFile()) {
  • trunk/j/src/org/armedbear/lisp/Load.java

    r10132 r10135  
    33 *
    44 * Copyright (C) 2002-2005 Peter Graves
    5  * $Id: Load.java,v 1.119 2005-10-17 15:44:44 piso Exp $
     5 * $Id: Load.java,v 1.120 2005-10-17 16:45:19 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    476476            String path = url.getPath();
    477477            if (path != null) {
    478                 if (Utilities.isPlatformWindows()) {
     478                if (Utilities.isPlatformWindows) {
    479479                    if (path.length() > 0 && path.charAt(0) == '/')
    480480                        path = path.substring(1);
  • trunk/j/src/org/armedbear/lisp/Pathname.java

    r10098 r10135  
    33 *
    44 * Copyright (C) 2003-2005 Peter Graves
    5  * $Id: Pathname.java,v 1.104 2005-10-14 16:14:31 piso Exp $
     5 * $Id: Pathname.java,v 1.105 2005-10-17 16:45:19 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    113113            }
    114114        }
    115         if (Utilities.isPlatformUnix()) {
     115        if (Utilities.isPlatformUnix) {
    116116            if (s.equals("~"))
    117117                s = System.getProperty("user.home").concat("/");
  • trunk/j/src/org/armedbear/lisp/ShellCommand.java

    r10028 r10135  
    33 *
    44 * Copyright (C) 2000-2005 Peter Graves
    5  * $Id: ShellCommand.java,v 1.6 2005-09-25 15:00:15 piso Exp $
     5 * $Id: ShellCommand.java,v 1.7 2005-10-17 16:45:19 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    7070        try {
    7171            if (command != null) {
    72                 if (Utilities.isPlatformUnix()) {
     72                if (Utilities.isPlatformUnix) {
    7373                    if (directory != null) {
    7474                        FastStringBuffer sb = new FastStringBuffer("\\cd \"");
     
    8282                        process = Runtime.getRuntime().exec(cmdarray);
    8383                    }
    84                 } else if (Utilities.isPlatformWindows()) {
     84                } else if (Utilities.isPlatformWindows) {
    8585                    ArrayList list = new ArrayList();
    8686                    list.add("cmd.exe");
  • trunk/j/src/org/armedbear/lisp/Site.java

    r7724 r10135  
    22 * Site.java
    33 *
    4  * Copyright (C) 2003-2004 Peter Graves
    5  * $Id: Site.java,v 1.2 2004-09-18 02:06:10 piso Exp $
     4 * Copyright (C) 2003-2005 Peter Graves
     5 * $Id: Site.java,v 1.3 2005-10-17 16:45:19 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    3939                if (index >= 0) {
    4040                    lispHome = path.substring(0, index + 1);
    41                     if (Utilities.isPlatformWindows()) {
     41                    if (Utilities.isPlatformWindows) {
    4242                        if (lispHome.length() > 0 && lispHome.charAt(0) == '/')
    4343                            lispHome = lispHome.substring(1);
  • trunk/j/src/org/armedbear/lisp/Stream.java

    r10132 r10135  
    33 *
    44 * Copyright (C) 2003-2005 Peter Graves
    5  * $Id: Stream.java,v 1.138 2005-10-17 15:44:44 piso Exp $
     5 * $Id: Stream.java,v 1.139 2005-10-17 16:45:19 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    14571457            ++offset;
    14581458            if (n == '\r') {
    1459                 if (interactive && Utilities.isPlatformWindows())
     1459                if (interactive && Utilities.isPlatformWindows)
    14601460                    return _readChar();
    14611461            }
  • trunk/j/src/org/armedbear/lisp/Time.java

    r9380 r10135  
    33 *
    44 * Copyright (C) 2003-2005 Peter Graves
    5  * $Id: Time.java,v 1.28 2005-06-14 14:07:14 piso Exp $
     5 * $Id: Time.java,v 1.29 2005-10-17 16:45:20 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    9696        public LispObject execute() throws ConditionThrowable
    9797        {
    98             if (Utilities.isPlatformUnix()) {
     98            if (Utilities.isPlatformUnix) {
    9999                long userTime = -1;
    100100                long systemTime = -1;
  • trunk/j/src/org/armedbear/lisp/Utilities.java

    r10120 r10135  
    33 *
    44 * Copyright (C) 2003-2005 Peter Graves
    5  * $Id: Utilities.java,v 1.12 2005-10-16 02:03:28 piso Exp $
     5 * $Id: Utilities.java,v 1.13 2005-10-17 16:45:20 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    3838    }
    3939
    40     public static boolean isPlatformUnix()
    41     {
    42         return isPlatformUnix;
    43     }
    44 
    45     public static boolean isPlatformWindows()
    46     {
    47         return isPlatformWindows;
    48     }
    49 
    5040    public static boolean isFilenameAbsolute(String filename)
    5141    {
     
    5646                return true;
    5747            if (length > 2) {
    58                 if (isPlatformWindows()) {
     48                if (isPlatformWindows) {
    5949                    // Check for drive letter.
    6050                    char c1 = filename.charAt(1);
Note: See TracChangeset for help on using the changeset viewer.