diff --git a/pom.xml b/pom.xml index 41bddf0a..7fd975c4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 projectwizard-portlet life.qbic - 1.13.0-SNAPSHOT + 1.13.0 ProjectWizard Portlet https://github.com/qbicsoftware/projectwizard-portlet Creates hierarchical experiments using factorial design. diff --git a/src/main/java/life/qbic/portal/portlet/ProjectWizardUI.java b/src/main/java/life/qbic/portal/portlet/ProjectWizardUI.java index c4fc3700..b3af1187 100644 --- a/src/main/java/life/qbic/portal/portlet/ProjectWizardUI.java +++ b/src/main/java/life/qbic/portal/portlet/ProjectWizardUI.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.vaadin.teemu.wizards.Wizard; @@ -33,8 +34,6 @@ import life.qbic.omero.BasicOMEROClient; import life.qbic.openbis.openbisclient.IOpenBisClient; import life.qbic.openbis.openbisclient.OpenBisClient; -import life.qbic.portal.portlet.QBiCPortletUI; -import life.qbic.portal.samplegraph.GraphPage; import life.qbic.portal.utils.ConfigurationManager; import life.qbic.portal.utils.ConfigurationManagerFactory; import life.qbic.portal.utils.PortalUtils; @@ -64,7 +63,7 @@ public class ProjectWizardUI extends QBiCPortletUI { List expTypes = new ArrayList( Arrays.asList("Q_EXPERIMENTAL_DESIGN", "Q_SAMPLE_EXTRACTION", "Q_SAMPLE_PREPARATION")); - private Logger logger = LogManager.getLogger(ProjectWizardUI.class); + private final static Logger logger = LogManager.getLogger(ProjectWizardUI.class); private ConfigurationManager config; @@ -284,17 +283,16 @@ public static String getPathToVaadinFolder() { if (PortalUtils.isLiferayPortlet()) { Properties prop = new Properties(); // workaround - GraphPage p = new GraphPage(); - InputStream in = p.getClass().getClassLoader() - .getResourceAsStream("WEB-INF/liferay-plugin-package.properties"); + InputStream in = ProjectWizardUI.class.getClassLoader() + .getResourceAsStream("portlet.properties"); try { prop.load(in); in.close(); } catch (IOException e1) { - // TODO Auto-generated catch block + logger.error("Could not load portlet.properties"); e1.printStackTrace(); } - String portletName = prop.getProperty("name"); + String portletName = prop.getProperty("artifact.id"); URI location = UI.getCurrent().getPage().getLocation(); // http diff --git a/src/main/java/life/qbic/projectwizard/views/ExperimentImportView.java b/src/main/java/life/qbic/projectwizard/views/ExperimentImportView.java index 26c39cf8..60b2cfda 100644 --- a/src/main/java/life/qbic/projectwizard/views/ExperimentImportView.java +++ b/src/main/java/life/qbic/projectwizard/views/ExperimentImportView.java @@ -160,8 +160,8 @@ public void buttonClick(ClickEvent event) { Resource res = new ExternalResource(ProjectWizardUI.getPathToVaadinFolder() + "img/isatools.png"); - Image imNotYourC_Pal = new Image(null, res); - layout.addComponent(imNotYourC_Pal); + Image isaTools = new Image(null, res); + layout.addComponent(isaTools); subWindow.setContent(layout); // Center it in the browser window diff --git a/src/main/resources/portlet.properties b/src/main/resources/portlet.properties index 4cb0e4a2..62944429 100644 --- a/src/main/resources/portlet.properties +++ b/src/main/resources/portlet.properties @@ -3,3 +3,4 @@ include-and-override=${liferay.home}/qbic-ext.properties # Do not modify the values. These are automatically resolved by maven during the build. version=${project.version} repository.url=${project.url} +artifact.id=${artifactId}