Commit 6909cabf authored by Radek Ošlejšek's avatar Radek Ošlejšek
Browse files

Merge branch '200-move-project-management-into-a-toolbar' into 'master' 

Resolve "Move project management into a toolbar"

Closes #200

See merge request grp-fidentis/analyst2!215
parents bc57dac5 185f8022

GUI/src/main/java/cz/fidentis/analyst/project/ProjectPanel.form

+129 −187

File changed.

Preview size limit exceeded, changes collapsed.

GUI/src/main/java/cz/fidentis/analyst/project/ProjectPanel.java

+119 −184

File changed.

Preview size limit exceeded, changes collapsed.

GUI/src/main/java/cz/fidentis/analyst/project/ProjectTopComp.java

+18 −0
Original line number Diff line number Diff line
@@ -143,6 +143,24 @@ public final class ProjectTopComp extends TopComponent { 
        // TODO add custom code on component closing

    }

    

    public void openProject() {

        if (projectPanel.loadNewProject()) {

            projectPanel.openProject();

        }

    }

    

    public void newProject() {

        if (projectPanel.loadNewProject()) {

            projectPanel.newProject();

        }

    }

    

    public void saveProject() {

        if (!projectPanel.saveProject()) {

            projectPanel.saveCurrentProject();

        }

    }

   

    void writeProperties(java.util.Properties p) {

        // better to version settings since initial version as advocated at

        // http://wiki.apidesign.org/wiki/PropertyFiles

GUI/src/main/java/cz/fidentis/analyst/project/toolbox/NewProjectAction.java

0 → 100644
+41 −0
Original line number Diff line number Diff line 
package cz.fidentis.analyst.project.toolbox;



import cz.fidentis.analyst.project.ProjectTopComp;

import java.awt.event.ActionEvent;

import java.awt.event.ActionListener;

import org.openide.awt.ActionID;

import org.openide.awt.ActionReference;

import org.openide.awt.ActionReferences;

import org.openide.awt.ActionRegistration;

import org.openide.util.NbBundle.Messages;

import org.openide.windows.WindowManager;



/**

 * Creates new project.

 * 

 * @author Radek Oslejsek

 */

@ActionID(

        category = "File",

        id = "cz.fidentis.analyst.project.toolbox.NewProjectAction"

)

@ActionRegistration(

        iconBase = "folder-new.png",

        displayName = "#CTL_NewProjectAction"

)

@ActionReferences({

    //@ActionReference(path = "Menu/File", position = 1300, separatorBefore = 1150, separatorAfter = 1250),

    @ActionReference(path = "Menu/File", position = 1220),

    @ActionReference(path = "Toolbars/File", position = 220)

})

@Messages("CTL_NewProjectAction=New Project...")

public final class NewProjectAction implements ActionListener {



    @Override

    public void actionPerformed(ActionEvent e) {

        ProjectTopComp win = (ProjectTopComp) WindowManager.getDefault().findTopComponent("ProjectTopComp");

        if (win != null) {

            win.newProject();

        }

    }

}

GUI/src/main/java/cz/fidentis/analyst/project/toolbox/OpenProjectAction.java

0 → 100644
+40 −0
Original line number Diff line number Diff line 
package cz.fidentis.analyst.project.toolbox;



import cz.fidentis.analyst.project.ProjectTopComp;

import java.awt.event.ActionEvent;

import java.awt.event.ActionListener;

import org.openide.awt.ActionID;

import org.openide.awt.ActionReference;

import org.openide.awt.ActionReferences;

import org.openide.awt.ActionRegistration;

import org.openide.util.NbBundle.Messages;

import org.openide.windows.WindowManager;



/**

 * Opens an existing project.

 * 

 * @author Radek Oslejsek

 */

@ActionID(

        category = "File",

        id = "cz.fidentis.analyst.project.toolbox.OpenProjectAction"

)

@ActionRegistration(

        iconBase = "folder.png",

        displayName = "#CTL_OpenProjectAction"

)

@ActionReferences({

    @ActionReference(path = "Menu/File", position = 1200),

    @ActionReference(path = "Toolbars/File", position = 200)

})

@Messages("CTL_OpenProjectAction=Open Project...")

public final class OpenProjectAction implements ActionListener {

    

    @Override

    public void actionPerformed(ActionEvent e) {

        ProjectTopComp win = (ProjectTopComp) WindowManager.getDefault().findTopComponent("ProjectTopComp");

        if (win != null) {

            win.openProject();

        }

    }

}