Skip to content

Commit 5b4af28

Browse files
committed
Removed dead code
1 parent af70053 commit 5b4af28

File tree

2 files changed

+0
-47
lines changed

2 files changed

+0
-47
lines changed

app/src/processing/app/Base.java

-38
Original file line numberDiff line numberDiff line change
@@ -156,50 +156,12 @@ static public void guardedMain(String args[]) throws Exception {
156156

157157
BaseNoGui.initVersion();
158158

159-
// if (System.getProperty("mrj.version") != null) {
160-
// //String jv = System.getProperty("java.version");
161-
// String ov = System.getProperty("os.version");
162-
// if (ov.startsWith("10.5")) {
163-
// System.setProperty("apple.laf.useScreenMenuBar", "true");
164-
// }
165-
// }
166-
167-
/*
168-
commandLine = false;
169-
if (args.length >= 2) {
170-
if (args[0].startsWith("--")) {
171-
commandLine = true;
172-
}
173-
}
174-
175-
if (PApplet.javaVersion < 1.5f) {
176-
//System.err.println("no way man");
177-
Base.showError("Need to install Java 1.5",
178-
"This version of Processing requires \n" +
179-
"Java 1.5 or later to run properly.\n" +
180-
"Please visit java.com to upgrade.", null);
181-
}
182-
*/
183-
184-
// // Set the look and feel before opening the window
185-
// try {
186-
// platform.setLookAndFeel();
187-
// } catch (Exception e) {
188-
// System.err.println("Non-fatal error while setting the Look & Feel.");
189-
// System.err.println("The error message follows, however Processing should run fine.");
190-
// System.err.println(e.getMessage());
191-
// //e.printStackTrace();
192-
// }
193-
194159
// Use native popups so they don't look so crappy on osx
195160
JPopupMenu.setDefaultLightWeightPopupEnabled(false);
196161

197162
// Don't put anything above this line that might make GUI,
198163
// because the platform has to be inited properly first.
199164

200-
// Make sure a full JDK is installed
201-
//initRequirements();
202-
203165
// setup the theme coloring fun
204166
Theme.init();
205167
System.setProperty("swing.aatext", PreferencesData.get("editor.antialias", "true"));

arduino-core/src/processing/app/BaseNoGui.java

-9
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,6 @@ static public int countLines(String what) {
130130
return count;
131131
}
132132

133-
static public String getAvrBasePath() {
134-
String path = getHardwarePath() + File.separator + "tools" +
135-
File.separator + "avr" + File.separator + "bin" + File.separator;
136-
if (OSUtils.isLinux() && !(new File(path)).exists()) {
137-
return ""; // use distribution provided avr tools if bundled tools missing
138-
}
139-
return path;
140-
}
141-
142133
static public PreferencesMap getBoardPreferences() {
143134
TargetBoard board = getTargetBoard();
144135
if (board == null)

0 commit comments

Comments
 (0)