You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2018/11/15 06:08:05 UTC
[myfaces-tobago] branch master updated: fix: checkstyle
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new aec3b43 fix: checkstyle
aec3b43 is described below
commit aec3b4393d8a74476368663db721abb2089dc8b9
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Thu Nov 15 07:07:43 2018 +0100
fix: checkstyle
TOBAGO-1931: TobagoBundle class doesn't work correctly
---
.../main/java/org/apache/myfaces/tobago/context/TobagoContext.java | 7 +++----
.../myfaces/tobago/internal/renderkit/renderer/FileRenderer.java | 2 +-
.../myfaces/tobago/context/TobagoMessageBundle_de.properties | 1 -
.../myfaces/tobago/context/TobagoMessageBundle_en.properties | 2 +-
.../myfaces/tobago/context/TobagoMessageBundle_es.properties | 1 -
.../apache/myfaces/tobago/context/TobagoResourceBundle.properties | 3 +--
.../myfaces/tobago/context/TobagoResourceBundle_de.properties | 5 ++---
.../myfaces/tobago/context/TobagoResourceBundle_es.properties | 5 ++---
8 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
index cb23516..8cb9e13 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
@@ -21,8 +21,6 @@ package org.apache.myfaces.tobago.context;
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.internal.util.CookieUtils;
-import org.apache.myfaces.tobago.util.MessageUtils;
-import org.apache.myfaces.tobago.util.ResourceUtils;
import org.apache.myfaces.tobago.util.VariableResolverUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,7 +49,8 @@ public class TobagoContext implements Serializable {
private String enctype;
/**
- * @deprecated Please use {@link ResourceUtils#getString} in Java or #{tobagoResourceBundle.key} in Facelets.
+ * @deprecated Please use {@link org.apache.myfaces.tobago.util.ResourceUtils#getString} in Java or
+ * #{tobagoResourceBundle.key} in Facelets.
*/
@Deprecated
public ResourceBundle getResourceBundle() {
@@ -62,7 +61,7 @@ public class TobagoContext implements Serializable {
}
/**
- * @deprecated Please use {@link MessageUtils}.
+ * @deprecated Please use {@link org.apache.myfaces.tobago.util.MessageUtils}.
*/
@Deprecated
public ResourceBundle getMessageBundle() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
index d828f14..7a0da40 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
@@ -164,7 +164,7 @@ public class FileRenderer extends MessageLayoutRendererBase implements Component
writer.writeIdAttribute(fieldId);
writer.writeClassAttribute(TobagoClass.FILE__REAL);
writer.writeNameAttribute(clientId);
- final String multiFormat = ResourceUtils.getString(facesContext,"tobago.file.multiFormat");
+ final String multiFormat = ResourceUtils.getString(facesContext, "tobago.file.multiFormat");
writer.writeAttribute(DataAttributes.dynamic("tobago-file-multi-format"), multiFormat, true);
// readonly seems not making sense in browsers.
writer.writeAttribute(HtmlAttributes.DISABLED, file.isDisabled() || file.isReadonly());
diff --git a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_de.properties b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_de.properties
index 2888447..786a406 100644
--- a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_de.properties
+++ b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_de.properties
@@ -7,7 +7,6 @@ org.apache.myfaces.tobago.FileItemValidator.SIZE_LIMIT_detail=Die Gr\u00F6\u00DF
org.apache.myfaces.tobago.Sheet.SORTING_ERROR=Sortieren nicht m\u00F6glich!
org.apache.myfaces.tobago.Sheet.SORTING_COL_ERROR_detail=Nach Spalte ''{0}'' kann nicht sortiert werden\!
tobago.SelectOne.MESSAGE_VALUE_REQUIRED=Eine Auswahl wird ben\u00F6tigt\!
-tobago.ajax.response.error=Server Error\: Fehler beim Bearbeiten der Anfrage. Eventuell ein Session Timeout\!
tobago.longrangevalidator.message.range.detail=Wert muss zwischen {0} und {1} liegen.
tobago.longrangevalidator.message.range.summary=Bereichs\u00FCberschreitung.
tobago.longrangevalidator.message.type.detail=Wert hat den falschen Typ.
diff --git a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_en.properties b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_en.properties
index 68325fa..9ce06a8 100644
--- a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_en.properties
+++ b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_en.properties
@@ -1 +1 @@
-# dummy
\ No newline at end of file
+# dummy
diff --git a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_es.properties b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_es.properties
index 7f6624b..f481a0e 100644
--- a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_es.properties
+++ b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_es.properties
@@ -7,7 +7,6 @@ org.apache.myfaces.tobago.FileItemValidator.SIZE_LIMIT_detail=El archivo subido
org.apache.myfaces.tobago.Sheet.SORTING_ERROR=No se puede ordenar!
org.apache.myfaces.tobago.Sheet.SORTING_COL_ERROR_detail=Despu\u00E9s de columna ''{0}'' no se puede ordenar!
tobago.SelectOne.MESSAGE_VALUE_REQUIRED=Se requiere seleccionar.
-tobago.ajax.response.error=Error en el servidor: No hay respuesta del servidor. Probablemente debido a un tiempo agotado de sesion!
tobago.longrangevalidator.message.range.detail=El valor debe de ser entre {0} y {1}.
tobago.longrangevalidator.message.range.summary=Fuera de rango.
tobago.longrangevalidator.message.type.detail=El valor no es del tipo correcto.
diff --git a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle.properties b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle.properties
index 6345249..d54e985 100644
--- a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle.properties
+++ b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle.properties
@@ -1,7 +1,7 @@
#Converted from './tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource.xml'
#Thu Sep 20 20:54:31 CEST 2018
browser.noframe.message.postfix=
-browser.noframe.message.prefix=Your user agent does not support frames or is currently configured not to display frames. However, you may visit the related document manually\:
+browser.noframe.message.prefix=Your user agent does not support frames or is currently configured not to display frames. However, you may visit the related document manually:
configButtonText=Configuration
configCachecoverage=Cache coverage
configContentType=Content type
@@ -22,7 +22,6 @@ sheetFirst=First Page
sheetLast=Last Page
sheetMenuSelect=Select all
sheetNext=Next Page
-sheetPagingInfoEmptyPage=
sheetPagingInfoEmptyRow=No rows available
sheetPagingInfoPagePagingTip=Click here, to change the displayed page
sheetPagingInfoPages=Page {0} of {1}
diff --git a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_de.properties b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_de.properties
index 22c83de..6600837 100644
--- a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_de.properties
+++ b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_de.properties
@@ -1,7 +1,7 @@
#Converted from './tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource_de.xml'
#Thu Sep 20 20:54:31 CEST 2018
browser.noframe.message.postfix=
-browser.noframe.message.prefix=Ihr Browser stellt keine so genannten Frames dar. Den Inhalt k\u00F6nnen Sie hier erreichen\:
+browser.noframe.message.prefix=Ihr Browser stellt keine so genannten Frames dar. Den Inhalt k\u00F6nnen Sie hier erreichen:
configButtonText=Einstellungen
configCachecoverage=Cache Abdeckung
configContentType=Inhaltstyp
@@ -22,8 +22,6 @@ sheetFirst=erste Seite
sheetLast=letzte Seite
sheetMenuSelect=Alles ausw\u00E4hlen
sheetNext=n\u00E4chste Seite
-sheetPagingInfoEmptyPage=
-sheetPagingInfoEmptyRow=Keine Zeilen verfügbar
sheetPagingInfoPagePagingTip=Hier klicken, zum Eingeben der anzuzeigenden Seite.
sheetPagingInfoPages=Seite {0} von {1}
sheetPagingInfoRowPagingTip=Hier klicken, zum Eingeben der ersten anzuzeigenden Zeile.
@@ -39,6 +37,7 @@ sheetTipSorting=nach dieser Spalte sortieren
sheetToPage=Seite {0}
tobago.file.multiFormat={} Dateien ausgew\u00E4hlt
tobago.in.inputSuggest.moreElements=Es gibt weitere passende Eintr\u00E4ge\u2026
+tobago.message.confirmation.okay=OK
tobago.message.confirmation.title=Meldungen
treeCopy=Kopieren
treeCut=Ausschneiden
diff --git a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_es.properties b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_es.properties
index 4731b23..26e93eb 100644
--- a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_es.properties
+++ b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_es.properties
@@ -1,7 +1,7 @@
#Converted from './tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource_es.xml'
#Thu Sep 20 20:54:31 CEST 2018
browser.noframe.message.postfix=
-browser.noframe.message.prefix=Tu navegador no soporta frames o est\u00E1 configurado para no desplegar frames. Como sea, puedes visitar el documento relacionado\:
+browser.noframe.message.prefix=Tu navegador no soporta frames o est\u00E1 configurado para no desplegar frames. Como sea, puedes visitar el documento relacionado:
configButtonText=Configuracion
configCachecoverage=Cobertura de cache
configContentType=Tipo de contenido
@@ -22,7 +22,6 @@ sheetFirst=Primera P\u00E1gina
sheetLast=\u00DAltima P\u00E1gina
sheetMenuSelect=Seleccionar todo
sheetNext=P\u00E1gina Siguiente
-sheetPagingInfoEmptyPage=
sheetPagingInfoEmptyRow=No hay registros disponibles
sheetPagingInfoPagePagingTip=Click aqu\u00ED, para cambiar el nombre desplegado.
sheetPagingInfoPages=P\u00E1gina {0} de {1}
@@ -37,9 +36,9 @@ sheetPagingInfoUndefinedSingleRow=Registro {0}
sheetPrev=P\u00E1gina Anterior
sheetTipSorting=Ordenar por esta columna
sheetToPage=P\u00E1gina {0}
-tobago.ajax.response.error=Error en el servidor\: No hay respuesta del servidor. Probablemente debido a un tiempo agotado de sesion\!
tobago.file.multiFormat={} archivos seleccionados
tobago.in.inputSuggest.moreElements=Hay m\u00E1s entradas aparejadas\u2026
+tobago.message.confirmation.okay=Enviar
tobago.message.confirmation.title=Aviso
treeCopy=Copiar
treeCut=Cortar