FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

moving packages around, changing some visibility to make it work · jekyllwrite/processing@610d320 · GitHub

  1. jekyllwrite
  2. processing

Repository navigation

Commit 610d320

Browse files
benfry
committed
moving packages around, changing some visibility to make it work
1 parent 30a42be commit 610d320

14 files changed

Lines changed: 73 additions & 70 deletions

‎app/src/processing/app/Base.java‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,12 @@
3535
import javax.swing.tree.*;
3636

3737
import processing.app.contrib.Contribution;
38+
import processing.app.contrib.ContributionListing;
39+
import processing.app.contrib.ContributionManager;
40+
import processing.app.contrib.ContributionManagerDialog;
3841
import processing.app.contrib.InstalledContribution;
42+
import processing.app.contrib.ModeContribution;
43+
import processing.app.contrib.ToolContribution;
3944
import processing.core.*;
4045

4146
/**
@@ -94,11 +99,8 @@ public class Base {
9499

95100
// A single instance of the library manager window
96101
ContributionManagerDialog libraryManagerFrame;
97-
98102
ContributionManagerDialog toolManagerFrame;
99-
100103
ContributionManagerDialog modeManagerFrame;
101-
102104
ContributionManagerDialog updateManagerFrame;
103105

104106
// set to true after the first time the menu is built.
@@ -116,7 +118,7 @@ public class Base {
116118

117119
private Mode defaultMode;
118120
private Mode[] coreModes;
119-
List<ModeContribution> contribModes;
121+
public List<ModeContribution> contribModes;
120122

121123
private JMenu sketchbookMenu;
122124

@@ -320,15 +322,15 @@ public static void initRequirements() {
320322

321323

322324
private void buildCoreModes() {
323-
defaultMode = ModeContribution
324-
.getCoreMode(this, "processing.mode.java.JavaMode",
325-
getContentFile("modes/java"));
326-
Mode androidMode = ModeContribution
327-
.getCoreMode(this, "processing.mode.android.AndroidMode",
328-
getContentFile("modes/android"));
329-
Mode javaScriptMode = ModeContribution
330-
.getCoreMode(this, "processing.mode.javascript.JavaScriptMode",
331-
getContentFile("modes/javascript"));
325+
defaultMode =
326+
ModeContribution.getCoreMode(this, "processing.mode.java.JavaMode",
327+
getContentFile("modes/java"));
328+
Mode androidMode =
329+
ModeContribution.getCoreMode(this, "processing.mode.android.AndroidMode",
330+
getContentFile("modes/android"));
331+
Mode javaScriptMode =
332+
ModeContribution.getCoreMode(this, "processing.mode.javascript.JavaScriptMode",
333+
getContentFile("modes/javascript"));
332334

333335
coreModes = new Mode[] { defaultMode, androidMode, javaScriptMode };
334336
}
@@ -340,8 +342,8 @@ void rebuildContribModes() {
340342
if (contribModes == null)
341343
contribModes = new ArrayList<ModeContribution>();
342344

343-
ArrayList<ModeContribution> newContribs = ModeContribution
344-
.list(this, getSketchbookModesFolder());
345+
ArrayList<ModeContribution> newContribs =
346+
ModeContribution.list(this, getSketchbookModesFolder());
345347
for (ModeContribution contrib : newContribs) {
346348
if (!contribModes.contains(contrib)) {
347349
if (contrib.instantiateModeClass()) {
@@ -626,7 +628,7 @@ public void storeSketch(Editor editor) {
626628
static final int SHORTCUT_KEY_MASK =
627629
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
628630
/** Command-W on Mac OS X, Ctrl-W on Windows and Linux */
629-
static final KeyStroke WINDOW_CLOSE_KEYSTROKE =
631+
public static final KeyStroke WINDOW_CLOSE_KEYSTROKE =
630632
KeyStroke.getKeyStroke('W', SHORTCUT_KEY_MASK);
631633
/** Command-Option on Mac OS X, Ctrl-Alt on Windows and Linux */
632634
static final int SHORTCUT_ALT_KEY_MASK = ActionEvent.ALT_MASK |

‎app/src/processing/app/Editor.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
package processing.app;
2424

25+
import processing.app.contrib.ToolContribution;
2526
import processing.app.syntax.*;
2627
import processing.app.tools.*;
2728
import processing.core.*;
@@ -106,7 +107,7 @@ public abstract class Editor extends JFrame implements RunnerListener {
106107
JMenu modeMenu;
107108

108109
ArrayList<ToolContribution> coreTools;
109-
ArrayList<ToolContribution> contribTools;
110+
public ArrayList<ToolContribution> contribTools;
110111

111112
protected Editor(final Base base, String path, int[] location, final Mode mode) {
112113
super("Processing");
@@ -872,7 +873,7 @@ protected void rebuildToolList() {
872873
}
873874

874875

875-
protected void rebuildToolMenu() {
876+
public void rebuildToolMenu() {
876877
if (toolsMenu == null) {
877878
toolsMenu = new JMenu("Tools");
878879
} else {

‎app/src/processing/app/Library.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class Library extends InstalledContribution {
3535
*/
3636
String nativeLibraryPath;
3737

38-
static String propertiesFileName = "library.properties";
38+
static public final String propertiesFileName = "library.properties";
3939

4040
/** Filter to pull out just files and no directories, and to skip export.txt */
4141
static FilenameFilter standardFilter = new FilenameFilter() {
@@ -371,13 +371,13 @@ public boolean accept(File dir, String name) {
371371
}
372372
};
373373

374-
static protected ArrayList<File> discover(File folder) {
374+
public static ArrayList<File> discover(File folder) {
375375
ArrayList<File> libraries = new ArrayList<File>();
376376
discover(folder, libraries);
377377
return libraries;
378378
}
379379

380-
static protected void discover(File folder, ArrayList<File> libraries) {
380+
static public void discover(File folder, ArrayList<File> libraries) {
381381
String[] list = folder.list(junkFolderFilter);
382382

383383
// if a bad folder or something like that, this might come back null
@@ -445,5 +445,4 @@ static protected void list(File folder, ArrayList<Library> libraries) {
445445
public Type getType() {
446446
return Type.LIBRARY;
447447
}
448-
449448
}

‎app/src/processing/app/Mode.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public abstract class Mode {
4242
protected File librariesFolder;
4343
protected File referenceFolder;
4444

45-
protected ArrayList<Library> coreLibraries;
46-
protected ArrayList<Library> contribLibraries;
45+
public ArrayList<Library> coreLibraries;
46+
public ArrayList<Library> contribLibraries;
4747

4848

4949
public Mode(Base base, File folder) {

‎app/src/processing/app/UpdateCheck.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,9 @@ public void updateCheck() throws Exception {
123123
// Wait for xml file to be downloaded and updates to come in. (this
124124
// should really be handled better).
125125
Thread.sleep(5 * 1000);
126-
if (!base.libraryManagerFrame.hasAlreadyBeenOpened()
127-
&& base.libraryManagerFrame.contribListing.hasUpdates()
128-
|| !base.toolManagerFrame.hasAlreadyBeenOpened()
129-
&& base.toolManagerFrame.contribListing.hasUpdates()
130-
|| !base.modeManagerFrame.hasAlreadyBeenOpened()
131-
&& base.modeManagerFrame.contribListing.hasUpdates()) {
126+
if (!base.libraryManagerFrame.hasAlreadyBeenOpened() && base.libraryManagerFrame.hasUpdates() ||
127+
!base.toolManagerFrame.hasAlreadyBeenOpened() && base.toolManagerFrame.hasUpdates() ||
128+
!base.modeManagerFrame.hasAlreadyBeenOpened() && base.modeManagerFrame.hasUpdates()) {
132129
promptToOpenContributionManager();
133130
}
134131
}

app/src/processing/app/ContributionListPanel.java renamed to app/src/processing/app/contrib/ContributionListPanel.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2121
*/
2222

23-
package processing.app;
23+
package processing.app.contrib;
2424

2525
import java.util.*;
2626
import java.util.List;
@@ -39,9 +39,9 @@
3939
import java.io.File;
4040
import java.net.*;
4141

42-
import processing.app.ContributionListing.AdvertisedContribution;
43-
import processing.app.ContributionListing.ContributionChangeListener;
44-
import processing.app.contrib.*;
42+
import processing.app.Base;
43+
import processing.app.contrib.ContributionListing.AdvertisedContribution;
44+
import processing.app.contrib.ContributionListing.ContributionChangeListener;
4545

4646
public class ContributionListPanel extends JPanel implements Scrollable, ContributionChangeListener {
4747

app/src/processing/app/ContributionListing.java renamed to app/src/processing/app/contrib/ContributionListing.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@
2121
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2222
*/
2323

24-
package processing.app;
24+
package processing.app.contrib;
2525

2626
import java.io.*;
2727
import java.net.*;
2828
import java.util.*;
2929
import java.util.concurrent.locks.ReentrantLock;
3030

31-
import processing.app.contrib.*;
32-
import processing.app.contrib.Contribution.Type;
31+
import processing.app.Base;
3332
import processing.core.PApplet;
3433

3534
public class ContributionListing {
@@ -468,7 +467,7 @@ public ArrayList<AdvertisedContribution> getLibraries(File f) {
468467
HashMap<String,String> exports = new HashMap<String,String>();
469468
Base.readSettings(null, strings, exports);
470469

471-
Type kind = Contribution.Type.toType(type);
470+
Contribution.Type kind = Contribution.Type.toType(type);
472471
outgoing.add(new AdvertisedContribution(kind, exports));
473472

474473
start = end + 1;
@@ -563,7 +562,7 @@ public boolean isDownloadingListing() {
563562
return downloadingListingLock.isLocked();
564563
}
565564

566-
static interface Filter {
565+
public static interface Filter {
567566

568567
boolean matches(Contribution contrib);
569568
}

app/src/processing/app/ContributionManager.java renamed to app/src/processing/app/contrib/ContributionManager.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package processing.app;
1+
package processing.app.contrib;
22

33
import java.io.*;
44
import java.net.URL;
@@ -8,9 +8,12 @@
88

99
import javax.swing.JOptionPane;
1010

11-
import processing.app.ContributionListing.AdvertisedContribution;
12-
import processing.app.contrib.*;
11+
import processing.app.Base;
12+
import processing.app.Editor;
13+
import processing.app.Library;
14+
import processing.app.Preferences;
1315
import processing.app.contrib.Contribution.Type;
16+
import processing.app.contrib.ContributionListing.AdvertisedContribution;
1417

1518
interface ErrorWidget {
1619
void setErrorMessage(String msg);
@@ -137,7 +140,7 @@ static public void refreshInstalled(Editor editor) {
137140
editor.rebuildToolMenu();
138141
}
139142

140-
static ArrayList<File> discover(Type type, File tempDir) {
143+
static ArrayList<File> discover(Contribution.Type type, File tempDir) {
141144
switch (type) {
142145
case LIBRARY:
143146
return Library.discover(tempDir);

app/src/processing/app/ContributionManagerDialog.java renamed to app/src/processing/app/contrib/ContributionManagerDialog.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2222
*/
2323

24-
package processing.app;
24+
package processing.app.contrib;
2525

2626
import java.awt.*;
2727
import java.awt.event.*;
@@ -31,36 +31,30 @@
3131
import javax.swing.*;
3232
import javax.swing.event.*;
3333

34-
import processing.app.ContributionListing.Filter;
35-
import processing.app.contrib.*;
34+
import processing.app.Base;
35+
import processing.app.Editor;
36+
import processing.app.Library;
37+
import processing.app.contrib.ContributionListing.Filter;
3638

3739
public class ContributionManagerDialog {
3840

3941
static final String ANY_CATEGORY = "All";
4042

4143
JFrame dialog;
42-
4344
String title;
44-
4545
Filter permaFilter;
46-
4746
JComboBox categoryChooser;
48-
4947
JScrollPane scrollPane;
50-
5148
ContributionListPanel contributionListPanel;
52-
5349
StatusPanel statusBar;
54-
5550
FilterField filterField;
5651

5752
// the calling editor, so updates can be applied
5853
Editor editor;
59-
6054
String category;
61-
6255
ContributionListing contribListing;
6356

57+
6458
public ContributionManagerDialog(String title,
6559
ContributionListing.Filter filter) {
6660

@@ -73,7 +67,13 @@ public ContributionManagerDialog(String title,
7367
contribListing.addContributionListener(contributionListPanel);
7468
}
7569

76-
protected void showFrame(Editor editor) {
70+
71+
public boolean hasUpdates() {
72+
return contribListing.hasUpdates();
73+
}
74+
75+
76+
public void showFrame(Editor editor) {
7777
this.editor = editor;
7878

7979
if (dialog == null) {

app/src/processing/app/FileDownloader.java renamed to app/src/processing/app/contrib/FileDownloader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2222
*/
2323

24-
package processing.app;
24+
package processing.app.contrib;
2525

2626
import java.io.File;
2727
import java.io.FileNotFoundException;

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL