Merge pull request #4 from evolutionsoftswiss/develop

Develop
evolutionsoftswiss · Feb 2, 2021 · c92cc5a · c92cc5a
2 parents 5900448 + 22a7845
commit c92cc5a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 	<artifactId>poker-calculator</artifactId>
 	<packaging>war</packaging>
 	<name>poker-calculator</name>
-	<version>1.1.0</version>
+	<version>1.2.0</version>
 
 	<build>
 

diff --git a/src/main/java/ch/evolutionsoft/poker/calculator/model/Calculator.java b/src/main/java/ch/evolutionsoft/poker/calculator/model/Calculator.java
@@ -12,9 +12,10 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.annotation.PostConstruct;
 import javax.faces.application.FacesMessage;
 import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
+import javax.faces.bean.ViewScoped;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.faces.event.ValueChangeEvent;
@@ -32,7 +33,7 @@
 import com.liferay.portal.kernel.util.PortalUtil;
 
 @ManagedBean(name = "calculator", eager = true)
-@SessionScoped
+@ViewScoped
 public class Calculator implements Serializable {
 
 	private static final long serialVersionUID = 6369666854255203618L;
@@ -75,10 +76,7 @@ public class Calculator implements Serializable {
 	private int numberOfHoleCards = 4;
 	private String selectedGameType = Integer.toString(Enumerate.GAME_OMAHA);
 
-	public Calculator() {
-		this.init();
-	}
-
+	@PostConstruct
 	public void init() {
 
 		this.clearResult();

diff --git a/src/main/webapp/WEB-INF/liferay-plugin-package.properties b/src/main/webapp/WEB-INF/liferay-plugin-package.properties
@@ -1,6 +1,6 @@
 name=poker-calculator
 module-group-id=poker-calculator
-module-incremental-version=2
+module-incremental-version=3
 tags=Poker,texas hold'em,omaha hi,omaha hi/lo,calculator
 short-description=Poker Calculator
 long-description=Poker Calculator supports calculating poker odds for Omaha Hi, Omaha Hi/Lo and Texas Hold'em.
@@ -9,4 +9,4 @@ page-url=https://evolution-soft.ch
 author=EvolutionSoft
 licenses=GPL-3.0-or-later
 speed-filters-enabled=false
-Bundle-Version=1.1.0
+Bundle-Version=1.2.0
diff --git a/src/main/webapp/WEB-INF/liferay-portlet.xml b/src/main/webapp/WEB-INF/liferay-portlet.xml
@@ -4,7 +4,6 @@
 <liferay-portlet-app>
 	<portlet>
 		<portlet-name>poker-calculator</portlet-name>
-		<icon>/resources/images/icon.png</icon>
 		<requires-namespaced-parameters>false</requires-namespaced-parameters>
 		<ajaxable>true</ajaxable>
 	</portlet>