← Back to branch summary

~ubuntu-branches/ubuntu/vivid/electric/vivid

« back to all changes in this revision

Viewing changes to com/sun/electric/tool/user/dialogs/OpenFile.java

  • Committer: Package Import Robot
  • Author(s): Markus Koschany
  • Date: 2014-07-08 21:54:23 UTC
  • mfrom: (1.1.6) (3.1.9 sid)
  • Revision ID: package-import@ubuntu.com-20140708215423-4zrgsca1e28tzcoc
Tags: 9.05+dfsg-1
* Imported Upstream version 9.05+dfsg.
* Add signing-key.pgp and check for valid upstream tarballs with uscan's
  pgpsigurlmangle feature.
* Move the package to Git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
com/sun/electric/tool/user/dialogs/OpenFile.java
165
165
         */
166
166
        public static String chooseInputFile(FileType type, String title, EditingPreferences ep)
167
167
        {
168
 
                if (ep == null) ep = Job.getUserInterface().lowLevelGetEditingPreferences();
 
168
                if (ep == null) ep = EditingPreferences.getInstance();
169
169
                return chooseInputFile(type, title, false, ep.getWorkingDirectory(), true, ep);
170
170
        }
171
171
 
175
175
         */
176
176
        public static String chooseDirectory(String title)
177
177
        {
178
 
                return chooseInputFile(null, title, true, User.getWorkingDirectory(), true, Job.getUserInterface().lowLevelGetEditingPreferences());
 
178
                return chooseInputFile(null, title, true, User.getWorkingDirectory(), true, EditingPreferences.getInstance());
179
179
        }
180
180
 
181
181
        /**
185
185
         * @param wantDirectory true to request a directory be selected, instead of a file.
186
186
         */
187
187
        public static String chooseInputFile(FileType type, String title, boolean wantDirectory) {
188
 
                return chooseInputFile(type, title, wantDirectory, User.getWorkingDirectory(), true, Job.getUserInterface().lowLevelGetEditingPreferences());
 
188
                return chooseInputFile(type, title, wantDirectory, User.getWorkingDirectory(), true, EditingPreferences.getInstance());
189
189
        }
190
190
 
191
191
        /**
214
214
                }
215
215
 
216
216
//              boolean useSwing = true;
217
 
                String path = (type != null) ? ep.getGroupDirectory(type) : null;
 
217
                String path = (type != null && ep != null) ? type.getGroupPath(ep) : null;
218
218
                if (path != null)
219
219
                        initialDir = path;
220
 
        
 
220
 
221
221
//              if (useSwing)
222
222
//              {
223
223
                        OpenFileSwing dialog = new OpenFileSwing();