Merge pull request #2 from evolutionsoftswiss/develop

Publish version 1.1.0

pom.xml

@@ -7,7 +7,7 @@
 	<artifactId>poker-calculator</artifactId>
 	<packaging>war</packaging>
 	<name>poker-calculator</name>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 
 	<build>
 

src/main/java/ch/evolutionsoft/poker/calculator/model/Calculator.java

@@ -252,7 +252,7 @@ public void removeBoardCard() {
 	public void addPlayer() {
 
 		if (this.hands.size() < MAX_PLAYER_SIZE) {
-			this.hands.add(new PlayerHand(this.numberOfHoleCards));
+			this.hands.add(new PlayerHand(this, this.numberOfHoleCards));
 		}
 	}
 
@@ -578,8 +578,8 @@ public boolean containsCard(String value) {
 	void initPlayers() {
 
 		this.hands = new LinkedList<>();
-		this.hands.add(new PlayerHand(this.numberOfHoleCards));
-		this.hands.add(new PlayerHand(this.numberOfHoleCards));
+		this.hands.add(new PlayerHand(this, this.numberOfHoleCards));
+		this.hands.add(new PlayerHand(this, this.numberOfHoleCards));
 	}
 
 	void initBoard() {
@@ -589,6 +589,7 @@ void initBoard() {
 		for (Card card : this.board.getCards()) {
 
 			card.setValue(null);
+			card.setCalculator(this);
 		}
 	}
 

src/main/java/ch/evolutionsoft/poker/calculator/model/Card.java

@@ -21,7 +21,7 @@ public class Card implements Serializable {
 	private static final String[] ranks = { "A", "2", "3", "4", "5", "6", "7", "8", "9", "T", "J", "Q", "K" };
 
 	private static final String[] suits = { "s", "h", "d", "c" };
-
+	
 	private static Map<String, String> validCards;
 	static {
 
@@ -34,8 +34,11 @@ public class Card implements Serializable {
 			}
 		}
 	}
+
 	public static final String EMPTY_IMAGE_PATH = "images/emptycard.png";
 
+	private Calculator calculator;
+
 	private String value;
 	private String imagePath = EMPTY_IMAGE_PATH;
 
@@ -54,7 +57,10 @@ public String getLowerCaseValue() {
 
 	public void valueChange(ValueChangeEvent valueChangeEvent) {
 
-		this.setValue(String.valueOf(valueChangeEvent.getNewValue()));
+		String cardValue = String.valueOf(valueChangeEvent.getNewValue());
+		this.setValue(cardValue);
+
+		calculator.updateCardPaths();
 	}
 
 	public void setValue(String value) {
@@ -183,4 +189,12 @@ public int hashCode() {
 
 		return 0;
 	}
+
+	public Calculator getCalculator() {
+		return calculator;
+	}
+
+	public void setCalculator(Calculator calculator) {
+		this.calculator = calculator;
+	}
 }

src/main/java/ch/evolutionsoft/poker/calculator/model/PlayerHand.java

@@ -10,11 +10,12 @@ public class PlayerHand implements Serializable{
 
 	private Card[] hand;
 
-	public PlayerHand(int numberOfHoleCards) {
+	public PlayerHand(Calculator calculator, int numberOfHoleCards) {
 
 		this.hand = new Card[numberOfHoleCards];
 		for (int index = 0; index < this.hand.length; index++) {
 			this.hand[index] = new Card();
+			this.hand[index].setCalculator(calculator);
 		}
 	}
 

src/main/webapp/WEB-INF/liferay-plugin-package.properties

@@ -1,12 +1,12 @@
 name=poker-calculator
 module-group-id=poker-calculator
-module-incremental-version=1
+module-incremental-version=2
 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.
 change-log=
-page-url=http://evolution-soft.ch
+page-url=https://evolution-soft.ch
 author=EvolutionSoft
 licenses=LGPL
 speed-filters-enabled=false
-Bundle-Version=1.0.0
+Bundle-Version=1.1.0

src/main/webapp/WEB-INF/resources/css/portlet-override.css

@@ -7,10 +7,16 @@
 }
 
 .bigCardImage {
-	width: 90%;	
+	width: 100%;	
 }
 
 .smallCardImage {
 	width: 40px;
 	margin: 2px 2px;	
 }
+
+@media screen and (max-width: 768px) {
+
+	.content-desktop {display: none;}
+
+}

src/main/webapp/WEB-INF/views/input.xhtml

@@ -9,6 +9,7 @@
     <h:panelGrid columns="3">
     <c:forEach var="hand" items="#{calculator.hands}" varStatus="playerStatus" >
       <ace:panel>
+      <h:outputLabel for="player" value="Player #{playerStatus.index + 1}"/>
       <c:forEach id="player" var="card" items="#{hand.cards}" varStatus="cardStatus" >
         <h:commandLink action="#{calculator.removePlayerCard}" >
           <f:ajax render="menuForm inputForm cardsForm" />
@@ -17,11 +18,11 @@
           <h:graphicImage name="#{card.imagePath}" styleClass="smallCardImage" />
         </h:commandLink>
       </c:forEach>
-      <h:outputLabel for="player" value="Player #{playerStatus.index + 1}"/>
       <c:forEach var="card" items="#{hand.cards}" varStatus="cardStatus">
             <h:inputText value="#{card.value}" validator="#{card.validate}" 
                            valueChangeListener="#{card.valueChange}" size="2"
-                           tabindex="#{(playerStatus.index + 1) * 4 + cardStatus.index}">
+                           tabindex="#{(playerStatus.index + 1) * 4 + cardStatus.index}"
+                           styleClass="content-desktop">
                <f:ajax render="menuForm inputForm cardsForm" />
             </h:inputText>
       </c:forEach>
@@ -31,18 +32,19 @@
 
     <h:panelGrid columns="1" styleClass="boardPanel">
     <ace:panel>
+    <h:outputLabel for="board" value="Board"/>
     <c:forEach var="card" items="#{calculator.boardCards}" varStatus="boardStatus">
        <h:commandLink action="#{calculator.removeBoardCard}" >
           <f:ajax render="menuForm inputForm cardsForm" />
           <f:param name="cardParam" value="#{boardStatus.index}" />
          <h:graphicImage name="#{card.imagePath}" styleClass="smallCardImage" />
       </h:commandLink>
     </c:forEach>
-    <h:outputLabel for="board" value="Board"/>
     <c:forEach id="board" var="card" items="#{calculator.boardCards}">
       <h:inputText id="boardCard" validator="#{card.validate}" value="#{card.value}" 
                      valueChangeListener="#{card.valueChange}" size="2"
-                     tabindex="#{100 + boardStatus.index}">
+                     tabindex="#{100 + boardStatus.index}"
+                     styleClass="content-desktop">
         <f:ajax render="menuForm inputForm cardsForm" />
       </h:inputText>
     </c:forEach>