You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2021/02/26 14:06:08 UTC
[deltaspike] branch master updated (cf9f373 -> a058e45)
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git.
from cf9f373 Merge pull request #114 from SethFalco/add-on-docs
new 5c618d3 fix small test failurs and Diamond
new a058e45 fix compile error
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/deltaspike/core/impl/message/DefaultMessage.java | 4 ++--
.../apache/deltaspike/core/impl/scope/window/WindowContextImpl.java | 2 +-
.../deltaspike/test/jsf/impl/injection/uc001/InjectionDroneTest.java | 2 +-
.../impl/src/test/resources/injection/testValidatorConverter.xhtml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
[deltaspike] 02/02: fix compile error
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git
commit a058e4559d0363ed956780e81f2e6f0d84d0ead3
Author: Mark Struberg <st...@apache.org>
AuthorDate: Fri Feb 26 14:46:46 2021 +0100
fix compile error
---
.../org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java
index a9ad9c8..8a88f31 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java
@@ -82,7 +82,7 @@ public class WindowContextImpl extends AbstractContext implements WindowContext
@Override
public String getCurrentWindowId()
{
- if (windowHolder == null)
+ if (windowIdHolder == null)
{
return null;
}
[deltaspike] 01/02: fix small test failurs and Diamond
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git
commit 5c618d393953d7ab32d4e774bdba26ca88af1ff7
Author: Mark Struberg <st...@apache.org>
AuthorDate: Fri Feb 26 11:54:52 2021 +0100
fix small test failurs and Diamond
---
.../java/org/apache/deltaspike/core/impl/message/DefaultMessage.java | 4 ++--
.../deltaspike/test/jsf/impl/injection/uc001/InjectionDroneTest.java | 2 +-
.../impl/src/test/resources/injection/testValidatorConverter.xhtml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
index 8b36898..4d41d97 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
@@ -41,7 +41,7 @@ import static org.apache.deltaspike.core.api.message.MessageResolver.MISSING_RES
public class DefaultMessage implements Message
{
private String messageTemplate;
- private List<Serializable> arguments = new ArrayList<Serializable>();
+ private List<Serializable> arguments = new ArrayList<>();
private MessageContext messageContext;
@@ -55,7 +55,7 @@ public class DefaultMessage implements Message
protected void reset()
{
messageTemplate = null;
- arguments = new ArrayList<Serializable>();
+ arguments = new ArrayList<>();
}
@Override
diff --git a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc001/InjectionDroneTest.java b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc001/InjectionDroneTest.java
index f554c41..3999e7b 100644
--- a/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc001/InjectionDroneTest.java
+++ b/deltaspike/modules/jsf/impl/src/test/java/org/apache/deltaspike/test/jsf/impl/injection/uc001/InjectionDroneTest.java
@@ -83,7 +83,7 @@ public class InjectionDroneTest
driver.get(new URL(contextPath, "testValidatorConverter.xhtml").toString());
WebElement convertedValue = driver.findElement(By.id("converter:convertedValue"));
convertedValue.sendKeys("String Value");
- WebElement testConveterButton = driver.findElement(By.id("converter:testConveterButton"));
+ WebElement testConveterButton = driver.findElement(By.id("converter:testConverterButton"));
testConveterButton.click();
Assert.assertTrue(ExpectedConditions.textToBePresentInElement(By.id("converter:errorMessage"), "Value is not an Integer").apply(driver));
}
diff --git a/deltaspike/modules/jsf/impl/src/test/resources/injection/testValidatorConverter.xhtml b/deltaspike/modules/jsf/impl/src/test/resources/injection/testValidatorConverter.xhtml
index 5b124b9..1bb2fc6 100644
--- a/deltaspike/modules/jsf/impl/src/test/resources/injection/testValidatorConverter.xhtml
+++ b/deltaspike/modules/jsf/impl/src/test/resources/injection/testValidatorConverter.xhtml
@@ -34,7 +34,7 @@
</h:inputText>
<h:message id="errorMessage" for="convertedValue" />
<br />
- <h:commandButton id="testConveterButton"
+ <h:commandButton id="testConverterButton"
action="#{myBean.testAction()}" value="Test Conveter" />
</h:form>
<h:form id="validator">