Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merged all CM into 1 #3423

Merged
merged 9 commits into from Jun 23, 2015
Merged

merged all CM into 1 #3423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
09388e5
initial phase
Akarshit Jun 17, 2015
44dbff4
Stable state
Akarshit Jun 19, 2015
5cbb75e
Added comments
Akarshit Jun 20, 2015
06ccaba
Merge remote-tracking branch 'upstream/master' into gsoc-CM
Akarshit Jun 20, 2015
792ccbf
Removed extra stuff
Akarshit Jun 23, 2015
79319fe
merged with the HEAD
Akarshit Jun 23, 2015
1417245
Removed some extra methods and corrected some merge stuff
Akarshit Jun 23, 2015
facc4a0
Fixed extra imports
Akarshit Jun 23, 2015
84eaa2e
corrected documentation
Akarshit Jun 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 9 additions & 20 deletions app/src/processing/app/Base.java
View file
Open in desktop
Expand Up @@ -105,12 +105,9 @@ public class Base {
PreferencesFrame preferencesFrame;

// A single instance of the library manager window
ContributionManagerDialog libraryManagerFrame;
ContributionManagerDialog toolManagerFrame;
ContributionManagerDialog modeManagerFrame;
ContributionManagerDialog exampleManagerFrame;
ContributionManagerDialog updateManagerFrame;
ContributionManagerDialog contributionManagerFrame;


// Location for untitled items
static File untitledFolder;

Expand Down Expand Up @@ -397,16 +394,8 @@ public Base(String[] args) throws Exception {
}
}

libraryManagerFrame =
new ContributionManagerDialog(ContributionType.LIBRARY);
toolManagerFrame =
new ContributionManagerDialog(ContributionType.TOOL);
modeManagerFrame =
new ContributionManagerDialog(ContributionType.MODE);
exampleManagerFrame =
new ContributionManagerDialog(ContributionType.EXAMPLES);
updateManagerFrame =
new ContributionManagerDialog(null);
contributionManagerFrame =
new ContributionManagerDialog();

// Make sure ThinkDifferent has library examples too
nextMode.rebuildLibraryList();
Expand Down Expand Up @@ -1468,36 +1457,36 @@ public void handlePrefs() {
* Show the library installer window.
*/
public void handleOpenLibraryManager() {
libraryManagerFrame.showFrame(activeEditor);
contributionManagerFrame.showFrame(activeEditor,ContributionType.LIBRARY);
}


/**
* Show the tool installer window.
*/
public void handleOpenToolManager() {
toolManagerFrame.showFrame(activeEditor);
contributionManagerFrame.showFrame(activeEditor,ContributionType.TOOL);
}


/**
* Show the mode installer window.
*/
public void handleOpenModeManager() {
modeManagerFrame.showFrame(activeEditor);
contributionManagerFrame.showFrame(activeEditor,ContributionType.MODE);
}


/**
* Show the examples installer window.
*/
public void handleOpenExampleManager() {
exampleManagerFrame.showFrame(activeEditor);
contributionManagerFrame.showFrame(activeEditor,ContributionType.EXAMPLES);
}


public void handleShowUpdates() {
updateManagerFrame.showFrame(activeEditor);
contributionManagerFrame.showFrame(activeEditor,null);
}


Expand Down
10 changes: 2 additions & 8 deletions app/src/processing/app/UpdateCheck.java
View file
Open in desktop
Expand Up @@ -130,14 +130,8 @@ public void updateCheck() throws IOException, InterruptedException {
// Wait for xml file to be downloaded and updates to come in.
// (this should really be handled better).
Thread.sleep(5 * 1000);
if ((!base.libraryManagerFrame.hasAlreadyBeenOpened() &&
!base.toolManagerFrame.hasAlreadyBeenOpened() &&
!base.modeManagerFrame.hasAlreadyBeenOpened() &&
!base.exampleManagerFrame.hasAlreadyBeenOpened()) &&
(base.libraryManagerFrame.hasUpdates(base) ||
base.toolManagerFrame.hasUpdates(base) ||
base.modeManagerFrame.hasUpdates(base) ||
base.exampleManagerFrame.hasUpdates(base))) {
if ((!base.contributionManagerFrame.hasAlreadyBeenOpened()
&& (base.contributionManagerFrame.hasUpdates(base)))){
promptToOpenContributionManager();
}
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/processing/app/contrib/ContributionListPanel.java
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@

public class ContributionListPanel extends JPanel implements Scrollable, ContributionChangeListener {

ContributionManagerDialog contribManager;
ContributionTab contributionTab;
TreeMap<Contribution, ContributionPanel> panelByContribution;

static HyperlinkListener nullHyperlinkListener = new HyperlinkListener() {
Expand All @@ -56,10 +56,10 @@ public void hyperlinkUpdate(HyperlinkEvent e) { }
private ContributionListing contribListing = ContributionListing.getInstance();


public ContributionListPanel(ContributionManagerDialog libraryManager,
public ContributionListPanel(ContributionTab contributionTab,
ContributionFilter filter) {
super();
this.contribManager = libraryManager;
this.contributionTab = contributionTab;
this.filter = filter;

// contribListing = ContributionListing.getInstance();
Expand Down