Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 85ae3cbe97 | |||
| c7d321e50f | |||
| 97fd943168 | |||
| b26c2d18e4 | |||
| 7d1507f94b | |||
| 7d1a85a1ee | |||
| ac480df2a7 | |||
| ec9a49ade3 |
+1
-4
@@ -7,7 +7,4 @@ nbactions.xml
|
|||||||
*.log
|
*.log
|
||||||
docker.sock
|
docker.sock
|
||||||
.DS_Store
|
.DS_Store
|
||||||
.classpath
|
|
||||||
.factorypath
|
|
||||||
.settings/
|
|
||||||
.project
|
|
||||||
|
|||||||
-117
@@ -1,117 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2007-present the original author or authors.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
import java.net.*;
|
|
||||||
import java.io.*;
|
|
||||||
import java.nio.channels.*;
|
|
||||||
import java.util.Properties;
|
|
||||||
|
|
||||||
public class MavenWrapperDownloader {
|
|
||||||
|
|
||||||
private static final String WRAPPER_VERSION = "0.5.6";
|
|
||||||
/**
|
|
||||||
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
|
|
||||||
*/
|
|
||||||
private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
|
|
||||||
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
|
|
||||||
* use instead of the default one.
|
|
||||||
*/
|
|
||||||
private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
|
|
||||||
".mvn/wrapper/maven-wrapper.properties";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Path where the maven-wrapper.jar will be saved to.
|
|
||||||
*/
|
|
||||||
private static final String MAVEN_WRAPPER_JAR_PATH =
|
|
||||||
".mvn/wrapper/maven-wrapper.jar";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Name of the property which should be used to override the default download url for the wrapper.
|
|
||||||
*/
|
|
||||||
private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
|
|
||||||
|
|
||||||
public static void main(String args[]) {
|
|
||||||
System.out.println("- Downloader started");
|
|
||||||
File baseDirectory = new File(args[0]);
|
|
||||||
System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
|
|
||||||
|
|
||||||
// If the maven-wrapper.properties exists, read it and check if it contains a custom
|
|
||||||
// wrapperUrl parameter.
|
|
||||||
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
|
|
||||||
String url = DEFAULT_DOWNLOAD_URL;
|
|
||||||
if(mavenWrapperPropertyFile.exists()) {
|
|
||||||
FileInputStream mavenWrapperPropertyFileInputStream = null;
|
|
||||||
try {
|
|
||||||
mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
|
|
||||||
Properties mavenWrapperProperties = new Properties();
|
|
||||||
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
|
|
||||||
url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
|
|
||||||
} catch (IOException e) {
|
|
||||||
System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
|
|
||||||
} finally {
|
|
||||||
try {
|
|
||||||
if(mavenWrapperPropertyFileInputStream != null) {
|
|
||||||
mavenWrapperPropertyFileInputStream.close();
|
|
||||||
}
|
|
||||||
} catch (IOException e) {
|
|
||||||
// Ignore ...
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
System.out.println("- Downloading from: " + url);
|
|
||||||
|
|
||||||
File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
|
|
||||||
if(!outputFile.getParentFile().exists()) {
|
|
||||||
if(!outputFile.getParentFile().mkdirs()) {
|
|
||||||
System.out.println(
|
|
||||||
"- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
|
|
||||||
try {
|
|
||||||
downloadFileFromURL(url, outputFile);
|
|
||||||
System.out.println("Done");
|
|
||||||
System.exit(0);
|
|
||||||
} catch (Throwable e) {
|
|
||||||
System.out.println("- Error downloading");
|
|
||||||
e.printStackTrace();
|
|
||||||
System.exit(1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void downloadFileFromURL(String urlString, File destination) throws Exception {
|
|
||||||
if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
|
|
||||||
String username = System.getenv("MVNW_USERNAME");
|
|
||||||
char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
|
|
||||||
Authenticator.setDefault(new Authenticator() {
|
|
||||||
@Override
|
|
||||||
protected PasswordAuthentication getPasswordAuthentication() {
|
|
||||||
return new PasswordAuthentication(username, password);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
URL website = new URL(urlString);
|
|
||||||
ReadableByteChannel rbc;
|
|
||||||
rbc = Channels.newChannel(website.openStream());
|
|
||||||
FileOutputStream fos = new FileOutputStream(destination);
|
|
||||||
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
|
|
||||||
fos.close();
|
|
||||||
rbc.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Vendored
BIN
Binary file not shown.
-2
@@ -1,2 +0,0 @@
|
|||||||
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
|
|
||||||
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
|
|
||||||
@@ -1,310 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
# Licensed to the Apache Software Foundation (ASF) under one
|
|
||||||
# or more contributor license agreements. See the NOTICE file
|
|
||||||
# distributed with this work for additional information
|
|
||||||
# regarding copyright ownership. The ASF licenses this file
|
|
||||||
# to you under the Apache License, Version 2.0 (the
|
|
||||||
# "License"); you may not use this file except in compliance
|
|
||||||
# with the License. You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing,
|
|
||||||
# software distributed under the License is distributed on an
|
|
||||||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
# KIND, either express or implied. See the License for the
|
|
||||||
# specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
# Maven Start Up Batch script
|
|
||||||
#
|
|
||||||
# Required ENV vars:
|
|
||||||
# ------------------
|
|
||||||
# JAVA_HOME - location of a JDK home dir
|
|
||||||
#
|
|
||||||
# Optional ENV vars
|
|
||||||
# -----------------
|
|
||||||
# M2_HOME - location of maven2's installed home dir
|
|
||||||
# MAVEN_OPTS - parameters passed to the Java VM when running Maven
|
|
||||||
# e.g. to debug Maven itself, use
|
|
||||||
# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
|
|
||||||
# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
if [ -z "$MAVEN_SKIP_RC" ] ; then
|
|
||||||
|
|
||||||
if [ -f /etc/mavenrc ] ; then
|
|
||||||
. /etc/mavenrc
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f "$HOME/.mavenrc" ] ; then
|
|
||||||
. "$HOME/.mavenrc"
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
# OS specific support. $var _must_ be set to either true or false.
|
|
||||||
cygwin=false;
|
|
||||||
darwin=false;
|
|
||||||
mingw=false
|
|
||||||
case "`uname`" in
|
|
||||||
CYGWIN*) cygwin=true ;;
|
|
||||||
MINGW*) mingw=true;;
|
|
||||||
Darwin*) darwin=true
|
|
||||||
# Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
|
|
||||||
# See https://developer.apple.com/library/mac/qa/qa1170/_index.html
|
|
||||||
if [ -z "$JAVA_HOME" ]; then
|
|
||||||
if [ -x "/usr/libexec/java_home" ]; then
|
|
||||||
export JAVA_HOME="`/usr/libexec/java_home`"
|
|
||||||
else
|
|
||||||
export JAVA_HOME="/Library/Java/Home"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ -z "$JAVA_HOME" ] ; then
|
|
||||||
if [ -r /etc/gentoo-release ] ; then
|
|
||||||
JAVA_HOME=`java-config --jre-home`
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$M2_HOME" ] ; then
|
|
||||||
## resolve links - $0 may be a link to maven's home
|
|
||||||
PRG="$0"
|
|
||||||
|
|
||||||
# need this for relative symlinks
|
|
||||||
while [ -h "$PRG" ] ; do
|
|
||||||
ls=`ls -ld "$PRG"`
|
|
||||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
|
||||||
if expr "$link" : '/.*' > /dev/null; then
|
|
||||||
PRG="$link"
|
|
||||||
else
|
|
||||||
PRG="`dirname "$PRG"`/$link"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
saveddir=`pwd`
|
|
||||||
|
|
||||||
M2_HOME=`dirname "$PRG"`/..
|
|
||||||
|
|
||||||
# make it fully qualified
|
|
||||||
M2_HOME=`cd "$M2_HOME" && pwd`
|
|
||||||
|
|
||||||
cd "$saveddir"
|
|
||||||
# echo Using m2 at $M2_HOME
|
|
||||||
fi
|
|
||||||
|
|
||||||
# For Cygwin, ensure paths are in UNIX format before anything is touched
|
|
||||||
if $cygwin ; then
|
|
||||||
[ -n "$M2_HOME" ] &&
|
|
||||||
M2_HOME=`cygpath --unix "$M2_HOME"`
|
|
||||||
[ -n "$JAVA_HOME" ] &&
|
|
||||||
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
|
|
||||||
[ -n "$CLASSPATH" ] &&
|
|
||||||
CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
|
|
||||||
fi
|
|
||||||
|
|
||||||
# For Mingw, ensure paths are in UNIX format before anything is touched
|
|
||||||
if $mingw ; then
|
|
||||||
[ -n "$M2_HOME" ] &&
|
|
||||||
M2_HOME="`(cd "$M2_HOME"; pwd)`"
|
|
||||||
[ -n "$JAVA_HOME" ] &&
|
|
||||||
JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$JAVA_HOME" ]; then
|
|
||||||
javaExecutable="`which javac`"
|
|
||||||
if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
|
|
||||||
# readlink(1) is not available as standard on Solaris 10.
|
|
||||||
readLink=`which readlink`
|
|
||||||
if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
|
|
||||||
if $darwin ; then
|
|
||||||
javaHome="`dirname \"$javaExecutable\"`"
|
|
||||||
javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
|
|
||||||
else
|
|
||||||
javaExecutable="`readlink -f \"$javaExecutable\"`"
|
|
||||||
fi
|
|
||||||
javaHome="`dirname \"$javaExecutable\"`"
|
|
||||||
javaHome=`expr "$javaHome" : '\(.*\)/bin'`
|
|
||||||
JAVA_HOME="$javaHome"
|
|
||||||
export JAVA_HOME
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$JAVACMD" ] ; then
|
|
||||||
if [ -n "$JAVA_HOME" ] ; then
|
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
|
||||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
|
||||||
else
|
|
||||||
JAVACMD="$JAVA_HOME/bin/java"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
JAVACMD="`which java`"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -x "$JAVACMD" ] ; then
|
|
||||||
echo "Error: JAVA_HOME is not defined correctly." >&2
|
|
||||||
echo " We cannot execute $JAVACMD" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$JAVA_HOME" ] ; then
|
|
||||||
echo "Warning: JAVA_HOME environment variable is not set."
|
|
||||||
fi
|
|
||||||
|
|
||||||
CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
|
|
||||||
|
|
||||||
# traverses directory structure from process work directory to filesystem root
|
|
||||||
# first directory with .mvn subdirectory is considered project base directory
|
|
||||||
find_maven_basedir() {
|
|
||||||
|
|
||||||
if [ -z "$1" ]
|
|
||||||
then
|
|
||||||
echo "Path not specified to find_maven_basedir"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
basedir="$1"
|
|
||||||
wdir="$1"
|
|
||||||
while [ "$wdir" != '/' ] ; do
|
|
||||||
if [ -d "$wdir"/.mvn ] ; then
|
|
||||||
basedir=$wdir
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
# workaround for JBEAP-8937 (on Solaris 10/Sparc)
|
|
||||||
if [ -d "${wdir}" ]; then
|
|
||||||
wdir=`cd "$wdir/.."; pwd`
|
|
||||||
fi
|
|
||||||
# end of workaround
|
|
||||||
done
|
|
||||||
echo "${basedir}"
|
|
||||||
}
|
|
||||||
|
|
||||||
# concatenates all lines of a file
|
|
||||||
concat_lines() {
|
|
||||||
if [ -f "$1" ]; then
|
|
||||||
echo "$(tr -s '\n' ' ' < "$1")"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
BASE_DIR=`find_maven_basedir "$(pwd)"`
|
|
||||||
if [ -z "$BASE_DIR" ]; then
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
##########################################################################################
|
|
||||||
# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
|
|
||||||
# This allows using the maven wrapper in projects that prohibit checking in binary data.
|
|
||||||
##########################################################################################
|
|
||||||
if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
|
|
||||||
if [ "$MVNW_VERBOSE" = true ]; then
|
|
||||||
echo "Found .mvn/wrapper/maven-wrapper.jar"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [ "$MVNW_VERBOSE" = true ]; then
|
|
||||||
echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
|
|
||||||
fi
|
|
||||||
if [ -n "$MVNW_REPOURL" ]; then
|
|
||||||
jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
|
|
||||||
else
|
|
||||||
jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
|
|
||||||
fi
|
|
||||||
while IFS="=" read key value; do
|
|
||||||
case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
|
|
||||||
esac
|
|
||||||
done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
|
|
||||||
if [ "$MVNW_VERBOSE" = true ]; then
|
|
||||||
echo "Downloading from: $jarUrl"
|
|
||||||
fi
|
|
||||||
wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
|
|
||||||
if $cygwin; then
|
|
||||||
wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
|
|
||||||
fi
|
|
||||||
|
|
||||||
if command -v wget > /dev/null; then
|
|
||||||
if [ "$MVNW_VERBOSE" = true ]; then
|
|
||||||
echo "Found wget ... using wget"
|
|
||||||
fi
|
|
||||||
if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
|
|
||||||
wget "$jarUrl" -O "$wrapperJarPath"
|
|
||||||
else
|
|
||||||
wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
|
|
||||||
fi
|
|
||||||
elif command -v curl > /dev/null; then
|
|
||||||
if [ "$MVNW_VERBOSE" = true ]; then
|
|
||||||
echo "Found curl ... using curl"
|
|
||||||
fi
|
|
||||||
if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
|
|
||||||
curl -o "$wrapperJarPath" "$jarUrl" -f
|
|
||||||
else
|
|
||||||
curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
|
|
||||||
fi
|
|
||||||
|
|
||||||
else
|
|
||||||
if [ "$MVNW_VERBOSE" = true ]; then
|
|
||||||
echo "Falling back to using Java to download"
|
|
||||||
fi
|
|
||||||
javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
|
|
||||||
# For Cygwin, switch paths to Windows format before running javac
|
|
||||||
if $cygwin; then
|
|
||||||
javaClass=`cygpath --path --windows "$javaClass"`
|
|
||||||
fi
|
|
||||||
if [ -e "$javaClass" ]; then
|
|
||||||
if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
|
|
||||||
if [ "$MVNW_VERBOSE" = true ]; then
|
|
||||||
echo " - Compiling MavenWrapperDownloader.java ..."
|
|
||||||
fi
|
|
||||||
# Compiling the Java class
|
|
||||||
("$JAVA_HOME/bin/javac" "$javaClass")
|
|
||||||
fi
|
|
||||||
if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
|
|
||||||
# Running the downloader
|
|
||||||
if [ "$MVNW_VERBOSE" = true ]; then
|
|
||||||
echo " - Running MavenWrapperDownloader.java ..."
|
|
||||||
fi
|
|
||||||
("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
##########################################################################################
|
|
||||||
# End of extension
|
|
||||||
##########################################################################################
|
|
||||||
|
|
||||||
export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
|
|
||||||
if [ "$MVNW_VERBOSE" = true ]; then
|
|
||||||
echo $MAVEN_PROJECTBASEDIR
|
|
||||||
fi
|
|
||||||
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
|
|
||||||
|
|
||||||
# For Cygwin, switch paths to Windows format before running java
|
|
||||||
if $cygwin; then
|
|
||||||
[ -n "$M2_HOME" ] &&
|
|
||||||
M2_HOME=`cygpath --path --windows "$M2_HOME"`
|
|
||||||
[ -n "$JAVA_HOME" ] &&
|
|
||||||
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
|
|
||||||
[ -n "$CLASSPATH" ] &&
|
|
||||||
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
|
|
||||||
[ -n "$MAVEN_PROJECTBASEDIR" ] &&
|
|
||||||
MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Provide a "standardized" way to retrieve the CLI args that will
|
|
||||||
# work with both Windows and non-Windows executions.
|
|
||||||
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
|
|
||||||
export MAVEN_CMD_LINE_ARGS
|
|
||||||
|
|
||||||
WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
|
|
||||||
|
|
||||||
exec "$JAVACMD" \
|
|
||||||
$MAVEN_OPTS \
|
|
||||||
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
|
|
||||||
"-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
|
|
||||||
${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
|
|
||||||
@@ -1,182 +0,0 @@
|
|||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
@REM Licensed to the Apache Software Foundation (ASF) under one
|
|
||||||
@REM or more contributor license agreements. See the NOTICE file
|
|
||||||
@REM distributed with this work for additional information
|
|
||||||
@REM regarding copyright ownership. The ASF licenses this file
|
|
||||||
@REM to you under the Apache License, Version 2.0 (the
|
|
||||||
@REM "License"); you may not use this file except in compliance
|
|
||||||
@REM with the License. You may obtain a copy of the License at
|
|
||||||
@REM
|
|
||||||
@REM http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
@REM
|
|
||||||
@REM Unless required by applicable law or agreed to in writing,
|
|
||||||
@REM software distributed under the License is distributed on an
|
|
||||||
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
@REM KIND, either express or implied. See the License for the
|
|
||||||
@REM specific language governing permissions and limitations
|
|
||||||
@REM under the License.
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
@REM Maven Start Up Batch script
|
|
||||||
@REM
|
|
||||||
@REM Required ENV vars:
|
|
||||||
@REM JAVA_HOME - location of a JDK home dir
|
|
||||||
@REM
|
|
||||||
@REM Optional ENV vars
|
|
||||||
@REM M2_HOME - location of maven2's installed home dir
|
|
||||||
@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
|
|
||||||
@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
|
|
||||||
@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
|
|
||||||
@REM e.g. to debug Maven itself, use
|
|
||||||
@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
|
|
||||||
@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
|
|
||||||
@echo off
|
|
||||||
@REM set title of command window
|
|
||||||
title %0
|
|
||||||
@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
|
|
||||||
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
|
|
||||||
|
|
||||||
@REM set %HOME% to equivalent of $HOME
|
|
||||||
if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
|
|
||||||
|
|
||||||
@REM Execute a user defined script before this one
|
|
||||||
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
|
|
||||||
@REM check for pre script, once with legacy .bat ending and once with .cmd ending
|
|
||||||
if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
|
|
||||||
if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
|
|
||||||
:skipRcPre
|
|
||||||
|
|
||||||
@setlocal
|
|
||||||
|
|
||||||
set ERROR_CODE=0
|
|
||||||
|
|
||||||
@REM To isolate internal variables from possible post scripts, we use another setlocal
|
|
||||||
@setlocal
|
|
||||||
|
|
||||||
@REM ==== START VALIDATION ====
|
|
||||||
if not "%JAVA_HOME%" == "" goto OkJHome
|
|
||||||
|
|
||||||
echo.
|
|
||||||
echo Error: JAVA_HOME not found in your environment. >&2
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the >&2
|
|
||||||
echo location of your Java installation. >&2
|
|
||||||
echo.
|
|
||||||
goto error
|
|
||||||
|
|
||||||
:OkJHome
|
|
||||||
if exist "%JAVA_HOME%\bin\java.exe" goto init
|
|
||||||
|
|
||||||
echo.
|
|
||||||
echo Error: JAVA_HOME is set to an invalid directory. >&2
|
|
||||||
echo JAVA_HOME = "%JAVA_HOME%" >&2
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the >&2
|
|
||||||
echo location of your Java installation. >&2
|
|
||||||
echo.
|
|
||||||
goto error
|
|
||||||
|
|
||||||
@REM ==== END VALIDATION ====
|
|
||||||
|
|
||||||
:init
|
|
||||||
|
|
||||||
@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
|
|
||||||
@REM Fallback to current working directory if not found.
|
|
||||||
|
|
||||||
set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
|
|
||||||
IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
|
|
||||||
|
|
||||||
set EXEC_DIR=%CD%
|
|
||||||
set WDIR=%EXEC_DIR%
|
|
||||||
:findBaseDir
|
|
||||||
IF EXIST "%WDIR%"\.mvn goto baseDirFound
|
|
||||||
cd ..
|
|
||||||
IF "%WDIR%"=="%CD%" goto baseDirNotFound
|
|
||||||
set WDIR=%CD%
|
|
||||||
goto findBaseDir
|
|
||||||
|
|
||||||
:baseDirFound
|
|
||||||
set MAVEN_PROJECTBASEDIR=%WDIR%
|
|
||||||
cd "%EXEC_DIR%"
|
|
||||||
goto endDetectBaseDir
|
|
||||||
|
|
||||||
:baseDirNotFound
|
|
||||||
set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
|
|
||||||
cd "%EXEC_DIR%"
|
|
||||||
|
|
||||||
:endDetectBaseDir
|
|
||||||
|
|
||||||
IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
|
|
||||||
|
|
||||||
@setlocal EnableExtensions EnableDelayedExpansion
|
|
||||||
for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
|
|
||||||
@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
|
|
||||||
|
|
||||||
:endReadAdditionalConfig
|
|
||||||
|
|
||||||
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
|
|
||||||
set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
|
|
||||||
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
|
|
||||||
|
|
||||||
set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
|
|
||||||
|
|
||||||
FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
|
|
||||||
IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
|
|
||||||
)
|
|
||||||
|
|
||||||
@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
|
|
||||||
@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
|
|
||||||
if exist %WRAPPER_JAR% (
|
|
||||||
if "%MVNW_VERBOSE%" == "true" (
|
|
||||||
echo Found %WRAPPER_JAR%
|
|
||||||
)
|
|
||||||
) else (
|
|
||||||
if not "%MVNW_REPOURL%" == "" (
|
|
||||||
SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
|
|
||||||
)
|
|
||||||
if "%MVNW_VERBOSE%" == "true" (
|
|
||||||
echo Couldn't find %WRAPPER_JAR%, downloading it ...
|
|
||||||
echo Downloading from: %DOWNLOAD_URL%
|
|
||||||
)
|
|
||||||
|
|
||||||
powershell -Command "&{"^
|
|
||||||
"$webclient = new-object System.Net.WebClient;"^
|
|
||||||
"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
|
|
||||||
"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
|
|
||||||
"}"^
|
|
||||||
"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
|
|
||||||
"}"
|
|
||||||
if "%MVNW_VERBOSE%" == "true" (
|
|
||||||
echo Finished downloading %WRAPPER_JAR%
|
|
||||||
)
|
|
||||||
)
|
|
||||||
@REM End of extension
|
|
||||||
|
|
||||||
@REM Provide a "standardized" way to retrieve the CLI args that will
|
|
||||||
@REM work with both Windows and non-Windows executions.
|
|
||||||
set MAVEN_CMD_LINE_ARGS=%*
|
|
||||||
|
|
||||||
%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
|
|
||||||
if ERRORLEVEL 1 goto error
|
|
||||||
goto end
|
|
||||||
|
|
||||||
:error
|
|
||||||
set ERROR_CODE=1
|
|
||||||
|
|
||||||
:end
|
|
||||||
@endlocal & set ERROR_CODE=%ERROR_CODE%
|
|
||||||
|
|
||||||
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
|
|
||||||
@REM check for post script, once with legacy .bat ending and once with .cmd ending
|
|
||||||
if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
|
|
||||||
if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
|
|
||||||
:skipRcPost
|
|
||||||
|
|
||||||
@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
|
|
||||||
if "%MAVEN_BATCH_PAUSE%" == "on" pause
|
|
||||||
|
|
||||||
if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
|
|
||||||
|
|
||||||
exit /B %ERROR_CODE%
|
|
||||||
@@ -4,13 +4,13 @@
|
|||||||
|
|
||||||
<groupId>com.unicenta</groupId>
|
<groupId>com.unicenta</groupId>
|
||||||
<artifactId>unicentaopos</artifactId>
|
<artifactId>unicentaopos</artifactId>
|
||||||
<version>5.4.0</version>
|
<version>5.3.2</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<maven.compiler.source>1.8</maven.compiler.source>
|
<maven.compiler.source>11</maven.compiler.source>
|
||||||
<maven.compiler.target>1.8</maven.compiler.target>
|
<maven.compiler.target>11</maven.compiler.target>
|
||||||
<derby.version>10.14.2.0</derby.version>
|
<derby.version>10.15.2.0</derby.version>
|
||||||
</properties>
|
</properties>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
@@ -111,6 +111,24 @@
|
|||||||
<artifactId>itext</artifactId>
|
<artifactId>itext</artifactId>
|
||||||
<version>2.1.7</version>
|
<version>2.1.7</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.sf.jasperreports</groupId>
|
||||||
|
<artifactId>jasperreports</artifactId>
|
||||||
|
<version>6.15.0</version>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>com.lowagie</groupId>
|
||||||
|
<artifactId>itext</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.sf.jasperreports</groupId>
|
||||||
|
<artifactId>jasperreports-fonts</artifactId>
|
||||||
|
<version>6.15.0</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.poi</groupId>
|
<groupId>org.apache.poi</groupId>
|
||||||
<artifactId>poi</artifactId>
|
<artifactId>poi</artifactId>
|
||||||
@@ -122,6 +140,13 @@
|
|||||||
<artifactId>poi-ooxml</artifactId>
|
<artifactId>poi-ooxml</artifactId>
|
||||||
<version>3.17</version>
|
<version>3.17</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.xmlbeans</groupId>
|
||||||
|
<artifactId>xmlbeans</artifactId>
|
||||||
|
<version>5.1.1</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.sf.barcode4j</groupId>
|
<groupId>net.sf.barcode4j</groupId>
|
||||||
<artifactId>barcode4j</artifactId>
|
<artifactId>barcode4j</artifactId>
|
||||||
@@ -255,11 +280,11 @@
|
|||||||
<artifactId>derbytools</artifactId>
|
<artifactId>derbytools</artifactId>
|
||||||
<version>${derby.version}</version>
|
<version>${derby.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- <dependency>-->
|
<dependency>
|
||||||
<!-- <groupId>org.apache.derby</groupId>-->
|
<groupId>org.apache.derby</groupId>
|
||||||
<!-- <artifactId>derbyshared</artifactId>-->
|
<artifactId>derbyshared</artifactId>
|
||||||
<!-- <version>${derby.version}</version>-->
|
<version>${derby.version}</version>
|
||||||
<!-- </dependency>-->
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>xml-apis</groupId>
|
<groupId>xml-apis</groupId>
|
||||||
<artifactId>xml-apis</artifactId>
|
<artifactId>xml-apis</artifactId>
|
||||||
@@ -272,22 +297,7 @@
|
|||||||
<artifactId>fop</artifactId>
|
<artifactId>fop</artifactId>
|
||||||
<version>2.3</version>
|
<version>2.3</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>net.sf.jasperreports</groupId>
|
|
||||||
<artifactId>jasperreports</artifactId>
|
|
||||||
<version>6.12.2</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>com.lowagie</groupId>
|
|
||||||
<artifactId>itext</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.sf.jasperreports</groupId>
|
|
||||||
<artifactId>jasperreports-fonts</artifactId>
|
|
||||||
<version>6.0.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>ar.com.fdvs</groupId>
|
<groupId>ar.com.fdvs</groupId>
|
||||||
<artifactId>DynamicJasper-core-fonts</artifactId>
|
<artifactId>DynamicJasper-core-fonts</artifactId>
|
||||||
@@ -361,7 +371,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.unicenta</groupId>
|
<groupId>com.unicenta</groupId>
|
||||||
<artifactId>unicenta-plugins</artifactId>
|
<artifactId>unicenta-plugins</artifactId>
|
||||||
<version>1.3.1</version>
|
<version>1.2.7</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.gluonhq</groupId>
|
<groupId>com.gluonhq</groupId>
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ public class AppLocal {
|
|||||||
|
|
||||||
public static final String APP_NAME = "uniCenta oPOS";
|
public static final String APP_NAME = "uniCenta oPOS";
|
||||||
public static final String APP_ID = "unicentaopos";
|
public static final String APP_ID = "unicentaopos";
|
||||||
public static final String APP_VERSION = "5.4.0";
|
public static final String APP_VERSION = "5.3.2";
|
||||||
|
|
||||||
private static final LocaleResources m_resources;
|
private static final LocaleResources m_resources;
|
||||||
|
|
||||||
|
|||||||
@@ -197,7 +197,7 @@ public class DataLogicSales extends BeanFactoryDataSingle {
|
|||||||
, new SerializerWriteBasic(new Datas[]{
|
, new SerializerWriteBasic(new Datas[]{
|
||||||
Datas.STRING,
|
Datas.STRING,
|
||||||
Datas.STRING,
|
Datas.STRING,
|
||||||
Datas.INT})
|
Datas.BOOLEAN})
|
||||||
);
|
);
|
||||||
|
|
||||||
m_createSupp = new StaticSentence(s,
|
m_createSupp = new StaticSentence(s,
|
||||||
@@ -635,22 +635,6 @@ public class DataLogicSales extends BeanFactoryDataSingle {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public final CategoryInfo getCategoryInfoByName(String name) throws BasicException {
|
|
||||||
return (CategoryInfo) new PreparedSentence(s
|
|
||||||
, "SELECT "
|
|
||||||
+ "ID, "
|
|
||||||
+ "NAME, "
|
|
||||||
+ "IMAGE, "
|
|
||||||
+ "TEXTTIP, "
|
|
||||||
+ "CATSHOWNAME, "
|
|
||||||
+ "CATORDER "
|
|
||||||
+ "FROM categories "
|
|
||||||
+ "WHERE NAME = ? "
|
|
||||||
+ "ORDER BY CATORDER, NAME"
|
|
||||||
, SerializerWriteString.INSTANCE
|
|
||||||
, CategoryInfo.getSerializerRead()).find(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param id
|
* @param id
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
|
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
|
||||||
<SubComponents>
|
<SubComponents>
|
||||||
<Container class="javax.swing.JPanel" name="mainMenuJPanel">
|
<Container class="javax.swing.JPanel" name="jPanel1">
|
||||||
<Constraints>
|
<Constraints>
|
||||||
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
|
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
|
||||||
<BorderConstraints direction="Before"/>
|
<BorderConstraints direction="Before"/>
|
||||||
@@ -73,7 +73,7 @@
|
|||||||
<Group type="103" groupAlignment="0" attributes="0">
|
<Group type="103" groupAlignment="0" attributes="0">
|
||||||
<Group type="102" alignment="1" attributes="0">
|
<Group type="102" alignment="1" attributes="0">
|
||||||
<EmptySpace min="0" pref="0" max="-2" attributes="0"/>
|
<EmptySpace min="0" pref="0" max="-2" attributes="0"/>
|
||||||
<Component id="showMainMenuButton" min="-2" max="-2" attributes="0"/>
|
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
|
||||||
<EmptySpace max="-2" attributes="0"/>
|
<EmptySpace max="-2" attributes="0"/>
|
||||||
</Group>
|
</Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -81,15 +81,15 @@
|
|||||||
<DimensionLayout dim="1">
|
<DimensionLayout dim="1">
|
||||||
<Group type="103" groupAlignment="0" attributes="0">
|
<Group type="103" groupAlignment="0" attributes="0">
|
||||||
<Group type="102" attributes="0">
|
<Group type="102" attributes="0">
|
||||||
<EmptySpace max="32767" attributes="0"/>
|
<EmptySpace pref="88" max="32767" attributes="0"/>
|
||||||
<Component id="showMainMenuButton" pref="120" max="32767" attributes="0"/>
|
<Component id="jButton1" pref="33" max="32767" attributes="0"/>
|
||||||
<EmptySpace pref="95" max="32767" attributes="0"/>
|
<EmptySpace pref="188" max="32767" attributes="0"/>
|
||||||
</Group>
|
</Group>
|
||||||
</Group>
|
</Group>
|
||||||
</DimensionLayout>
|
</DimensionLayout>
|
||||||
</Layout>
|
</Layout>
|
||||||
<SubComponents>
|
<SubComponents>
|
||||||
<Component class="javax.swing.JButton" name="showMainMenuButton">
|
<Component class="javax.swing.JButton" name="jButton1">
|
||||||
<Properties>
|
<Properties>
|
||||||
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
||||||
<ResourceString bundle="pos_messages.properties" key="tooltip.menu" replaceFormat="AppLocal.getIntString("tooltip.menu")"/>
|
<ResourceString bundle="pos_messages.properties" key="tooltip.menu" replaceFormat="AppLocal.getIntString("tooltip.menu")"/>
|
||||||
@@ -112,14 +112,14 @@
|
|||||||
<Property name="requestFocusEnabled" type="boolean" value="false"/>
|
<Property name="requestFocusEnabled" type="boolean" value="false"/>
|
||||||
</Properties>
|
</Properties>
|
||||||
<Events>
|
<Events>
|
||||||
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="showMainMenuButtonActionPerformed"/>
|
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
|
||||||
</Events>
|
</Events>
|
||||||
</Component>
|
</Component>
|
||||||
</SubComponents>
|
</SubComponents>
|
||||||
</Container>
|
</Container>
|
||||||
</SubComponents>
|
</SubComponents>
|
||||||
</Container>
|
</Container>
|
||||||
<Container class="javax.swing.JPanel" name="salesScreenJPanel">
|
<Container class="javax.swing.JPanel" name="m_jPanelRight">
|
||||||
<Properties>
|
<Properties>
|
||||||
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
|
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
|
||||||
<Dimension value="[200, 40]"/>
|
<Dimension value="[200, 40]"/>
|
||||||
@@ -133,7 +133,7 @@
|
|||||||
|
|
||||||
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
|
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
|
||||||
<SubComponents>
|
<SubComponents>
|
||||||
<Container class="javax.swing.JPanel" name="salesScreenTitlePanel">
|
<Container class="javax.swing.JPanel" name="m_jPanelTitle">
|
||||||
<Constraints>
|
<Constraints>
|
||||||
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
|
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
|
||||||
<BorderConstraints direction="North"/>
|
<BorderConstraints direction="North"/>
|
||||||
@@ -142,7 +142,7 @@
|
|||||||
|
|
||||||
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
|
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
|
||||||
<SubComponents>
|
<SubComponents>
|
||||||
<Component class="javax.swing.JLabel" name="salesScreenTitleLabel">
|
<Component class="javax.swing.JLabel" name="m_jTitle">
|
||||||
<Properties>
|
<Properties>
|
||||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||||
<Font name="Arial" size="14" style="1"/>
|
<Font name="Arial" size="14" style="1"/>
|
||||||
|
|||||||
@@ -101,16 +101,20 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
|
|||||||
m_principalnotificator.setText(m_appuser.getName());
|
m_principalnotificator.setText(m_appuser.getName());
|
||||||
m_principalnotificator.setIcon(m_appuser.getIcon());
|
m_principalnotificator.setIcon(m_appuser.getIcon());
|
||||||
|
|
||||||
if (showMainMenuButton.getComponentOrientation().isLeftToRight()) {
|
if (jButton1.getComponentOrientation().isLeftToRight()) {
|
||||||
menu_open = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-right.png"));
|
menu_open = new javax.swing.ImageIcon(getClass().getResource(
|
||||||
menu_close = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-left.png"));
|
"/com/unicenta/images/menu-right.png"));
|
||||||
|
menu_close = new javax.swing.ImageIcon(getClass().getResource(
|
||||||
|
"/com/unicenta/images/menu-left.png"));
|
||||||
} else {
|
} else {
|
||||||
menu_open = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-left.png"));
|
menu_open = new javax.swing.ImageIcon(getClass().getResource(
|
||||||
menu_close = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-right.png"));
|
"/com/unicenta/images/menu-left.png"));
|
||||||
|
menu_close = new javax.swing.ImageIcon(getClass().getResource(
|
||||||
|
"/com/unicenta/images/menu-right.png"));
|
||||||
}
|
}
|
||||||
assignMenuButtonIcon();
|
assignMenuButtonIcon();
|
||||||
|
|
||||||
salesScreenTitlePanel.setVisible(false);
|
m_jPanelTitle.setVisible(false);
|
||||||
m_jPanelContainer.add(new JPanel(), "<NULL>");
|
m_jPanelContainer.add(new JPanel(), "<NULL>");
|
||||||
|
|
||||||
showView("<NULL>");
|
showView("<NULL>");
|
||||||
@@ -142,7 +146,9 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void assignMenuButtonIcon() {
|
private void assignMenuButtonIcon() {
|
||||||
showMainMenuButton.setIcon(m_jPanelLeft.isVisible() ? menu_close : menu_open);
|
jButton1.setIcon(m_jPanelLeft.isVisible()
|
||||||
|
? menu_close
|
||||||
|
: menu_open);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -484,13 +490,12 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
|
|||||||
m_jLastView = m_jMyView;
|
m_jLastView = m_jMyView;
|
||||||
|
|
||||||
setMenuVisible(getBounds().width > 800);
|
setMenuVisible(getBounds().width > 800);
|
||||||
setMenuVisible(getBounds().height > 600);
|
|
||||||
setMenuVisible(false);
|
setMenuVisible(false);
|
||||||
|
|
||||||
showView(sTaskClass);
|
showView(sTaskClass);
|
||||||
String sTitle = m_jMyView.getTitle();
|
String sTitle = m_jMyView.getTitle();
|
||||||
salesScreenTitlePanel.setVisible(sTitle != null);
|
m_jPanelTitle.setVisible(sTitle != null);
|
||||||
salesScreenTitleLabel.setText(sTitle);
|
m_jTitle.setText(sTitle);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
@@ -543,41 +548,41 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
|
|||||||
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
|
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
|
||||||
private void initComponents() {
|
private void initComponents() {
|
||||||
|
|
||||||
mainMenuJPanel = new javax.swing.JPanel();
|
jPanel1 = new javax.swing.JPanel();
|
||||||
m_jPanelLeft = new javax.swing.JScrollPane();
|
m_jPanelLeft = new javax.swing.JScrollPane();
|
||||||
jPanel2 = new javax.swing.JPanel();
|
jPanel2 = new javax.swing.JPanel();
|
||||||
showMainMenuButton = new javax.swing.JButton();
|
jButton1 = new javax.swing.JButton();
|
||||||
salesScreenJPanel = new javax.swing.JPanel();
|
m_jPanelRight = new javax.swing.JPanel();
|
||||||
salesScreenTitlePanel = new javax.swing.JPanel();
|
m_jPanelTitle = new javax.swing.JPanel();
|
||||||
salesScreenTitleLabel = new javax.swing.JLabel();
|
m_jTitle = new javax.swing.JLabel();
|
||||||
m_jPanelContainer = new javax.swing.JPanel();
|
m_jPanelContainer = new javax.swing.JPanel();
|
||||||
|
|
||||||
setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
setLayout(new java.awt.BorderLayout());
|
setLayout(new java.awt.BorderLayout());
|
||||||
|
|
||||||
mainMenuJPanel.setLayout(new java.awt.BorderLayout());
|
jPanel1.setLayout(new java.awt.BorderLayout());
|
||||||
|
|
||||||
m_jPanelLeft.setBackground(new java.awt.Color(102, 102, 102));
|
m_jPanelLeft.setBackground(new java.awt.Color(102, 102, 102));
|
||||||
m_jPanelLeft.setBorder(null);
|
m_jPanelLeft.setBorder(null);
|
||||||
m_jPanelLeft.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
m_jPanelLeft.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
m_jPanelLeft.setPreferredSize(new java.awt.Dimension(250, 2));
|
m_jPanelLeft.setPreferredSize(new java.awt.Dimension(250, 2));
|
||||||
mainMenuJPanel.add(m_jPanelLeft, java.awt.BorderLayout.LINE_START);
|
jPanel1.add(m_jPanelLeft, java.awt.BorderLayout.LINE_START);
|
||||||
|
|
||||||
jPanel2.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
jPanel2.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
||||||
jPanel2.setPreferredSize(new java.awt.Dimension(45, 45));
|
jPanel2.setPreferredSize(new java.awt.Dimension(45, 45));
|
||||||
|
|
||||||
showMainMenuButton.setToolTipText(AppLocal.getIntString("tooltip.menu")); // NOI18N
|
jButton1.setToolTipText(AppLocal.getIntString("tooltip.menu")); // NOI18N
|
||||||
showMainMenuButton.setFocusPainted(false);
|
jButton1.setFocusPainted(false);
|
||||||
showMainMenuButton.setFocusable(false);
|
jButton1.setFocusable(false);
|
||||||
showMainMenuButton.setIconTextGap(0);
|
jButton1.setIconTextGap(0);
|
||||||
showMainMenuButton.setMargin(new java.awt.Insets(10, 2, 10, 2));
|
jButton1.setMargin(new java.awt.Insets(10, 2, 10, 2));
|
||||||
showMainMenuButton.setMaximumSize(new java.awt.Dimension(45, 32224661));
|
jButton1.setMaximumSize(new java.awt.Dimension(45, 32224661));
|
||||||
showMainMenuButton.setMinimumSize(new java.awt.Dimension(32, 32));
|
jButton1.setMinimumSize(new java.awt.Dimension(32, 32));
|
||||||
showMainMenuButton.setPreferredSize(new java.awt.Dimension(36, 45));
|
jButton1.setPreferredSize(new java.awt.Dimension(36, 45));
|
||||||
showMainMenuButton.setRequestFocusEnabled(false);
|
jButton1.setRequestFocusEnabled(false);
|
||||||
showMainMenuButton.addActionListener(new java.awt.event.ActionListener() {
|
jButton1.addActionListener(new java.awt.event.ActionListener() {
|
||||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||||
showMainMenuButtonActionPerformed(evt);
|
jButton1ActionPerformed(evt);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -587,59 +592,59 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
|
|||||||
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
|
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
|
||||||
.addGap(0, 0, 0)
|
.addGap(0, 0, 0)
|
||||||
.addComponent(showMainMenuButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
.addContainerGap())
|
.addContainerGap())
|
||||||
);
|
);
|
||||||
jPanel2Layout.setVerticalGroup(
|
jPanel2Layout.setVerticalGroup(
|
||||||
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addGroup(jPanel2Layout.createSequentialGroup()
|
.addGroup(jPanel2Layout.createSequentialGroup()
|
||||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
.addContainerGap(88, Short.MAX_VALUE)
|
||||||
.addComponent(showMainMenuButton, javax.swing.GroupLayout.DEFAULT_SIZE, 120, Short.MAX_VALUE)
|
.addComponent(jButton1, javax.swing.GroupLayout.DEFAULT_SIZE, 33, Short.MAX_VALUE)
|
||||||
.addContainerGap(95, Short.MAX_VALUE))
|
.addContainerGap(188, Short.MAX_VALUE))
|
||||||
);
|
);
|
||||||
|
|
||||||
mainMenuJPanel.add(jPanel2, java.awt.BorderLayout.LINE_END);
|
jPanel1.add(jPanel2, java.awt.BorderLayout.LINE_END);
|
||||||
|
|
||||||
add(mainMenuJPanel, java.awt.BorderLayout.LINE_START);
|
add(jPanel1, java.awt.BorderLayout.LINE_START);
|
||||||
|
|
||||||
salesScreenJPanel.setPreferredSize(new java.awt.Dimension(200, 40));
|
m_jPanelRight.setPreferredSize(new java.awt.Dimension(200, 40));
|
||||||
salesScreenJPanel.setLayout(new java.awt.BorderLayout());
|
m_jPanelRight.setLayout(new java.awt.BorderLayout());
|
||||||
|
|
||||||
salesScreenTitlePanel.setLayout(new java.awt.BorderLayout());
|
m_jPanelTitle.setLayout(new java.awt.BorderLayout());
|
||||||
|
|
||||||
salesScreenTitleLabel.setFont(new java.awt.Font("Arial", 1, 14)); // NOI18N
|
m_jTitle.setFont(new java.awt.Font("Arial", 1, 14)); // NOI18N
|
||||||
salesScreenTitleLabel.setForeground(new java.awt.Color(0, 168, 223));
|
m_jTitle.setForeground(new java.awt.Color(0, 168, 223));
|
||||||
salesScreenTitleLabel.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createMatteBorder(0, 0, 1, 0, java.awt.Color.darkGray), javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10)));
|
m_jTitle.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createMatteBorder(0, 0, 1, 0, java.awt.Color.darkGray), javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10)));
|
||||||
salesScreenTitleLabel.setMaximumSize(new java.awt.Dimension(100, 35));
|
m_jTitle.setMaximumSize(new java.awt.Dimension(100, 35));
|
||||||
salesScreenTitleLabel.setMinimumSize(new java.awt.Dimension(30, 25));
|
m_jTitle.setMinimumSize(new java.awt.Dimension(30, 25));
|
||||||
salesScreenTitleLabel.setPreferredSize(new java.awt.Dimension(100, 35));
|
m_jTitle.setPreferredSize(new java.awt.Dimension(100, 35));
|
||||||
salesScreenTitlePanel.add(salesScreenTitleLabel, java.awt.BorderLayout.NORTH);
|
m_jPanelTitle.add(m_jTitle, java.awt.BorderLayout.NORTH);
|
||||||
|
|
||||||
salesScreenJPanel.add(salesScreenTitlePanel, java.awt.BorderLayout.NORTH);
|
m_jPanelRight.add(m_jPanelTitle, java.awt.BorderLayout.NORTH);
|
||||||
|
|
||||||
m_jPanelContainer.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
m_jPanelContainer.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
m_jPanelContainer.setLayout(new java.awt.CardLayout());
|
m_jPanelContainer.setLayout(new java.awt.CardLayout());
|
||||||
salesScreenJPanel.add(m_jPanelContainer, BorderLayout.CENTER);
|
m_jPanelRight.add(m_jPanelContainer, java.awt.BorderLayout.CENTER);
|
||||||
|
|
||||||
add(salesScreenJPanel, java.awt.BorderLayout.CENTER);
|
add(m_jPanelRight, java.awt.BorderLayout.CENTER);
|
||||||
}// </editor-fold>//GEN-END:initComponents
|
}// </editor-fold>//GEN-END:initComponents
|
||||||
|
|
||||||
private void showMainMenuButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_showMainMenuButtonActionPerformed
|
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
|
||||||
|
|
||||||
setMenuVisible(!m_jPanelLeft.isVisible());
|
setMenuVisible(!m_jPanelLeft.isVisible());
|
||||||
|
|
||||||
}//GEN-LAST:event_showMainMenuButtonActionPerformed
|
}//GEN-LAST:event_jButton1ActionPerformed
|
||||||
|
|
||||||
|
|
||||||
// Variables declaration - do not modify//GEN-BEGIN:variables
|
// Variables declaration - do not modify//GEN-BEGIN:variables
|
||||||
|
private javax.swing.JButton jButton1;
|
||||||
|
private javax.swing.JPanel jPanel1;
|
||||||
private javax.swing.JPanel jPanel2;
|
private javax.swing.JPanel jPanel2;
|
||||||
private javax.swing.JPanel m_jPanelContainer;
|
private javax.swing.JPanel m_jPanelContainer;
|
||||||
private javax.swing.JScrollPane m_jPanelLeft;
|
private javax.swing.JScrollPane m_jPanelLeft;
|
||||||
private javax.swing.JPanel mainMenuJPanel;
|
private javax.swing.JPanel m_jPanelRight;
|
||||||
private javax.swing.JPanel salesScreenJPanel;
|
private javax.swing.JPanel m_jPanelTitle;
|
||||||
private javax.swing.JLabel salesScreenTitleLabel;
|
private javax.swing.JLabel m_jTitle;
|
||||||
private javax.swing.JPanel salesScreenTitlePanel;
|
|
||||||
private javax.swing.JButton showMainMenuButton;
|
|
||||||
// End of variables declaration//GEN-END:variables
|
// End of variables declaration//GEN-END:variables
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1021,7 +1021,7 @@ public class JRootApp extends JPanel implements AppView, DeviceMonitorEventListe
|
|||||||
jLabel2.setPreferredSize(new java.awt.Dimension(180, 34));
|
jLabel2.setPreferredSize(new java.awt.Dimension(180, 34));
|
||||||
m_jPanelTitle.add(jLabel2, java.awt.BorderLayout.LINE_START);
|
m_jPanelTitle.add(jLabel2, java.awt.BorderLayout.LINE_START);
|
||||||
|
|
||||||
//add(m_jPanelTitle, java.awt.BorderLayout.NORTH);
|
add(m_jPanelTitle, java.awt.BorderLayout.NORTH);
|
||||||
|
|
||||||
m_jPanelContainer.setLayout(new java.awt.CardLayout());
|
m_jPanelContainer.setLayout(new java.awt.CardLayout());
|
||||||
|
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ public class StartPOS {
|
|||||||
metrics.setUniCentaVersion(AppLocal.APP_VERSION);
|
metrics.setUniCentaVersion(AppLocal.APP_VERSION);
|
||||||
Application application = new Application();
|
Application application = new Application();
|
||||||
application.postMetrics(metrics);
|
application.postMetrics(metrics);
|
||||||
application.startEventListener(host, jRootApp, null);
|
application.startEventListener(host, jRootApp);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("Problem with starting the uniCenta plugin application:${}", e.getMessage());
|
log.error("Problem with starting the uniCenta plugin application:${}", e.getMessage());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
|
|||||||
|
|
||||||
protected SaveProvider spr;
|
protected SaveProvider spr;
|
||||||
|
|
||||||
private String category;
|
private String Category;
|
||||||
private String categoryName;
|
private String categoryName;
|
||||||
private String categoryParentid;
|
private String categoryParentid;
|
||||||
private Integer categoryCatorder;
|
private Integer categoryCatorder;
|
||||||
@@ -374,7 +374,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
|
|||||||
String SellPrice = products.get((String) jComboSell.getSelectedItem());
|
String SellPrice = products.get((String) jComboSell.getSelectedItem());
|
||||||
productTax = products.get((String) jComboTax.getSelectedItem());
|
productTax = products.get((String) jComboTax.getSelectedItem());
|
||||||
|
|
||||||
category = products.get((String) jComboCategory.getSelectedItem());
|
Category = products.get((String) jComboCategory.getSelectedItem());
|
||||||
Supplier = products.get((String) jComboSupplier.getSelectedItem());
|
Supplier = products.get((String) jComboSupplier.getSelectedItem());
|
||||||
|
|
||||||
currentRecord++;
|
currentRecord++;
|
||||||
@@ -518,17 +518,17 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
|
|||||||
private String getCategory() {
|
private String getCategory() {
|
||||||
|
|
||||||
if (jComboCategory.getSelectedItem() != category_default) {
|
if (jComboCategory.getSelectedItem() != category_default) {
|
||||||
String cat = (String) cat_list.get(category);
|
String cat = (String) cat_list.get(Category);
|
||||||
|
|
||||||
if (cat != null) {
|
if (cat != null) {
|
||||||
return (cat);
|
return (cat);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!category.equals("")) {
|
if (!Category.equals("")) {
|
||||||
Object[] newcat = new Object[3];
|
Object[] newcat = new Object[3];
|
||||||
newcat[0] = UUID.randomUUID().toString();
|
newcat[0] = UUID.randomUUID().toString();
|
||||||
newcat[1] = category;
|
newcat[1] = Category;
|
||||||
newcat[2] = true;
|
newcat[2] = true;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -539,15 +539,15 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
|
|||||||
m_CategoryModel.setSelectedItem(category);
|
m_CategoryModel.setSelectedItem(category);
|
||||||
cat_list.put(category.toString(), m_CategoryModel.getSelectedKey().toString());
|
cat_list.put(category.toString(), m_CategoryModel.getSelectedKey().toString());
|
||||||
}
|
}
|
||||||
String cat = (String) cat_list.get(category);
|
String cat = (String) cat_list.get(Category);
|
||||||
return (cat);
|
return (cat);
|
||||||
} catch (BasicException ex) {
|
} catch (BasicException ex) {
|
||||||
log.error(ex.getMessage());
|
log.error(ex.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!badCategories.contains(category)) {
|
if (!badCategories.contains(Category)) {
|
||||||
badCategories.add(category.trim()); // Save a list of the bad categories
|
badCategories.add(Category.trim()); // Save a list of the bad categories
|
||||||
}
|
}
|
||||||
return ((jComboDefaultCategory.getSelectedItem()
|
return ((jComboDefaultCategory.getSelectedItem()
|
||||||
== reject_bad_category)
|
== reject_bad_category)
|
||||||
@@ -968,7 +968,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
|
|||||||
myprod[7] = productSellPrice; // Sell price
|
myprod[7] = productSellPrice; // Sell price
|
||||||
myprod[8] = previousBuy; // Previous Buy price double
|
myprod[8] = previousBuy; // Previous Buy price double
|
||||||
myprod[9] = previousSell; // Previous Sell price double
|
myprod[9] = previousSell; // Previous Sell price double
|
||||||
myprod[10] = category; // Category
|
myprod[10] = Category; // Category
|
||||||
myprod[11] = productTax; // Tax
|
myprod[11] = productTax; // Tax
|
||||||
myprod[12] = Supplier; // Supplier
|
myprod[12] = Supplier; // Supplier
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -2221,14 +2221,13 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
|
|
||||||
if (checkProduct != null) {
|
if (checkProduct != null) {
|
||||||
|
|
||||||
if (checkProduct.getUnits() != null && checkProduct.getUnits() <= 0) {
|
if (checkProduct.getUnits() <= 0) {
|
||||||
jCheckStock.setForeground(Color.magenta);
|
jCheckStock.setForeground(Color.magenta);
|
||||||
} else {
|
} else {
|
||||||
jCheckStock.setForeground(Color.darkGray);
|
jCheckStock.setForeground(Color.darkGray);
|
||||||
}
|
}
|
||||||
|
|
||||||
double dUnits = checkProduct.getUnits() == null ? 0.0 : checkProduct.getUnits();
|
double dUnits = checkProduct.getUnits();
|
||||||
|
|
||||||
int iUnits;
|
int iUnits;
|
||||||
iUnits = (int) dUnits;
|
iUnits = (int) dUnits;
|
||||||
jCheckStock.setText(Integer.toString(iUnits));
|
jCheckStock.setText(Integer.toString(iUnits));
|
||||||
|
|||||||
@@ -23,8 +23,6 @@ import com.unicenta.pos.catalog.CatalogSelector;
|
|||||||
import com.unicenta.pos.catalog.JCatalog;
|
import com.unicenta.pos.catalog.JCatalog;
|
||||||
import com.unicenta.pos.forms.AppView;
|
import com.unicenta.pos.forms.AppView;
|
||||||
import com.unicenta.pos.ticket.ProductInfoExt;
|
import com.unicenta.pos.ticket.ProductInfoExt;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
|
|
||||||
import java.awt.Component;
|
import java.awt.Component;
|
||||||
import java.awt.Dimension;
|
import java.awt.Dimension;
|
||||||
import java.awt.event.ActionEvent;
|
import java.awt.event.ActionEvent;
|
||||||
@@ -36,7 +34,6 @@ import javax.swing.event.ListSelectionListener;
|
|||||||
*
|
*
|
||||||
* @author JG uniCenta
|
* @author JG uniCenta
|
||||||
*/
|
*/
|
||||||
@Slf4j
|
|
||||||
public class JPanelTicketSales extends JPanelTicket {
|
public class JPanelTicketSales extends JPanelTicket {
|
||||||
|
|
||||||
private CatalogSelector m_cat;
|
private CatalogSelector m_cat;
|
||||||
@@ -98,7 +95,6 @@ public class JPanelTicketSales extends JPanelTicket {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
protected JTicketsBag getJTicketsBag() {
|
protected JTicketsBag getJTicketsBag() {
|
||||||
log.debug("Get JTickets Bag");
|
|
||||||
return JTicketsBag.createTicketsBag(m_App.getProperties().getProperty("machine.ticketsbag"), m_App, this);
|
return JTicketsBag.createTicketsBag(m_App.getProperties().getProperty("machine.ticketsbag"), m_App, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,8 +7,6 @@ package com.unicenta.pos.sales.restaurant;
|
|||||||
import com.unicenta.data.loader.Session;
|
import com.unicenta.data.loader.Session;
|
||||||
import com.unicenta.pos.forms.AppView;
|
import com.unicenta.pos.forms.AppView;
|
||||||
import com.unicenta.pos.forms.DataLogicSystem;
|
import com.unicenta.pos.forms.DataLogicSystem;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
|
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.PreparedStatement;
|
import java.sql.PreparedStatement;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
@@ -20,7 +18,7 @@ import java.sql.Timestamp;
|
|||||||
*
|
*
|
||||||
* @author JDL
|
* @author JDL
|
||||||
*/
|
*/
|
||||||
@Slf4j
|
|
||||||
public class RestaurantDBUtils {
|
public class RestaurantDBUtils {
|
||||||
private Session s;
|
private Session s;
|
||||||
private Connection con;
|
private Connection con;
|
||||||
@@ -306,10 +304,10 @@ public class RestaurantDBUtils {
|
|||||||
rs = stmt.executeQuery(SQL);
|
rs = stmt.executeQuery(SQL);
|
||||||
|
|
||||||
if (rs.next()){
|
if (rs.next()){
|
||||||
return(rs.getString("TICKETID"));
|
String customer =rs.getString("TICKETID");
|
||||||
|
return(customer);
|
||||||
}
|
}
|
||||||
}catch(SQLException e){
|
}catch(SQLException e){
|
||||||
log.error("Error running SQL: {}{}", SQL, e.getMessage());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return "";
|
return "";
|
||||||
@@ -555,21 +553,6 @@ public class RestaurantDBUtils {
|
|||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getTableId (String nameOfTable){
|
|
||||||
try{
|
|
||||||
SQL = "SELECT ID FROM places WHERE NAME='"+ nameOfTable + "'";
|
|
||||||
stmt = con.createStatement();
|
|
||||||
rs = stmt.executeQuery(SQL);
|
|
||||||
|
|
||||||
if (rs.next()){
|
|
||||||
return(rs.getString("ID"));
|
|
||||||
}
|
|
||||||
}catch(SQLException e){
|
|
||||||
log.error("Error running SQL: {}{}", SQL, e.getMessage());
|
|
||||||
}
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param tableID
|
* @param tableID
|
||||||
|
|||||||
@@ -53,7 +53,6 @@ public class JTicketsBagShared extends JTicketsBag {
|
|||||||
private DataLogicSales dlSales = null;
|
private DataLogicSales dlSales = null;
|
||||||
private final DataLogicSystem dlSystem;
|
private final DataLogicSystem dlSystem;
|
||||||
private Boolean showList;
|
private Boolean showList;
|
||||||
private int existingOrderCount;
|
|
||||||
|
|
||||||
|
|
||||||
/** Creates new form JTicketsBagShared
|
/** Creates new form JTicketsBagShared
|
||||||
@@ -82,7 +81,7 @@ public class JTicketsBagShared extends JTicketsBag {
|
|||||||
log.debug("Loading Sales screen! "+this.getClass());
|
log.debug("Loading Sales screen! "+this.getClass());
|
||||||
|
|
||||||
ExecutorService customExecutor = Executors.newCachedThreadPool();
|
ExecutorService customExecutor = Executors.newCachedThreadPool();
|
||||||
SwingWorker<String, String> reloadLayaway = new SwingWorker() {
|
SwingWorker<String, String> reloadLayaway = new SwingWorker<>() {
|
||||||
@Override
|
@Override
|
||||||
protected String doInBackground() throws Exception {
|
protected String doInBackground() throws Exception {
|
||||||
while (true) {
|
while (true) {
|
||||||
@@ -141,26 +140,12 @@ public class JTicketsBagShared extends JTicketsBag {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void updateCount() {
|
public void updateCount() {
|
||||||
|
|
||||||
/*
|
|
||||||
1. Need to get / set the existing count
|
|
||||||
2. When count increases show dialog
|
|
||||||
*/
|
|
||||||
try {
|
try {
|
||||||
List<SharedTicketInfo> l = dlReceipts.getSharedTicketList();
|
List<SharedTicketInfo> l = dlReceipts.getSharedTicketList();
|
||||||
int count = l.size();
|
int count = l.size();
|
||||||
|
|
||||||
if (count > existingOrderCount) {
|
|
||||||
log.info("New Order Received from the API!");
|
|
||||||
// show Order Window
|
|
||||||
// List<ReprintTicketInfo> ticketInfoList= dlSales.getReprintTicketList();
|
|
||||||
// JTicketsReprintList listDialog = JTicketsReprintList.newJDialog(JTicketsBagShared.this);
|
|
||||||
// String id = listDialog.showTicketsList(ticketInfoList, dlSales);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (count > 0) {
|
if (count > 0) {
|
||||||
m_jListTickets.setText(Integer.toString(count));
|
m_jListTickets.setText(Integer.toString(count));
|
||||||
existingOrderCount = count;
|
|
||||||
} else {
|
} else {
|
||||||
m_jListTickets.setText("");
|
m_jListTickets.setText("");
|
||||||
}
|
}
|
||||||
@@ -442,10 +427,6 @@ public class JTicketsBagShared extends JTicketsBag {
|
|||||||
((JRootApp)m_App).closeAppView();
|
((JRootApp)m_App).closeAppView();
|
||||||
}//GEN-LAST:event_m_jHoldActionPerformed
|
}//GEN-LAST:event_m_jHoldActionPerformed
|
||||||
|
|
||||||
private void showOrderWindow() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void m_jReprintTicketsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jReprintTicketsActionPerformed
|
private void m_jReprintTicketsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jReprintTicketsActionPerformed
|
||||||
SwingUtilities.invokeLater(new Runnable() {
|
SwingUtilities.invokeLater(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ import com.unicenta.data.loader.DataRead;
|
|||||||
import com.unicenta.data.loader.IKeyed;
|
import com.unicenta.data.loader.IKeyed;
|
||||||
import com.unicenta.data.loader.SerializerRead;
|
import com.unicenta.data.loader.SerializerRead;
|
||||||
|
|
||||||
|
|
||||||
public class VoucherInfo implements IKeyed {
|
public class VoucherInfo implements IKeyed {
|
||||||
private String id;
|
private String id;
|
||||||
private String voucherNumber;
|
private String voucherNumber;
|
||||||
@@ -39,7 +40,8 @@ public class VoucherInfo implements IKeyed {
|
|||||||
String voucherNumber,
|
String voucherNumber,
|
||||||
String customerName,
|
String customerName,
|
||||||
double amount,
|
double amount,
|
||||||
String status) {
|
String status)
|
||||||
|
{
|
||||||
this.id = id;
|
this.id = id;
|
||||||
this.voucherNumber = voucherNumber;
|
this.voucherNumber = voucherNumber;
|
||||||
this.customerName = customerName;
|
this.customerName = customerName;
|
||||||
@@ -47,6 +49,7 @@ public class VoucherInfo implements IKeyed {
|
|||||||
this.status = status;
|
this.status = status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Object getKey() {
|
public Object getKey() {
|
||||||
return getId();
|
return getId();
|
||||||
@@ -108,6 +111,7 @@ public class VoucherInfo implements IKeyed {
|
|||||||
this.amount = amount;
|
this.amount = amount;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return voucherNumber;
|
return voucherNumber;
|
||||||
@@ -128,7 +132,8 @@ public class VoucherInfo implements IKeyed {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static SerializerRead getSerializerRead() {
|
public static SerializerRead getSerializerRead() {
|
||||||
return new SerializerRead() {
|
return new SerializerRead()
|
||||||
|
{
|
||||||
@Override
|
@Override
|
||||||
public Object readValues(DataRead dr) throws BasicException {
|
public Object readValues(DataRead dr) throws BasicException {
|
||||||
return new VoucherInfo(
|
return new VoucherInfo(
|
||||||
@@ -137,7 +142,6 @@ public class VoucherInfo implements IKeyed {
|
|||||||
dr.getString(3),
|
dr.getString(3),
|
||||||
dr.getDouble(4),
|
dr.getDouble(4),
|
||||||
dr.getString(5));
|
dr.getString(5));
|
||||||
}
|
}};
|
||||||
};
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,62 +1,2 @@
|
|||||||
-- CLEAR THE DECKS
|
UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
|
||||||
DELETE FROM sharedtickets;
|
|
||||||
|
|
||||||
-- Switch OFF table foreign key relationships
|
|
||||||
set foreign_key_checks = 0;
|
|
||||||
|
|
||||||
-- RECREATE applications table
|
|
||||||
DROP TABLE `applications`;
|
|
||||||
CREATE TABLE IF NOT EXISTS `applications` (
|
|
||||||
`id` varchar(255) NOT NULL,
|
|
||||||
`name` varchar(255) NOT NULL,
|
|
||||||
`version` varchar(255) NOT NULL,
|
|
||||||
`instdate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
|
||||||
PRIMARY KEY ( `id` )
|
|
||||||
) ENGINE = InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT = Compact;
|
|
||||||
|
|
||||||
|
|
||||||
-- SYSTEM
|
|
||||||
DELETE FROM resources WHERE name = 'script.posapps';
|
|
||||||
|
|
||||||
|
|
||||||
DELETE FROM resources WHERE id = '0';
|
|
||||||
DELETE FROM resources WHERE id = '00';
|
|
||||||
INSERT INTO resources(id, name, restype, content) VALUES('00', 'Menu.Root', 0, $FILE{/com/unicenta/pos/templates/Menu.Root.txt});
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Ticket.Buttons.xml} WHERE name = 'Ticket.Buttons';
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Printer.Ticket.xml} WHERE name = 'Printer.Ticket';
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Ticket.Close.xml} WHERE name = 'Ticket.Close';
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Cash.Close.xml} WHERE name = 'Cash.Close';
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.created.xml} WHERE name = 'Customer.Created';
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.deleted.xml} WHERE name = 'Customer.Deleted';
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.updated.xml} WHERE name = 'Customer.Updated';
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
|
|
||||||
-- ROLES
|
|
||||||
DELETE FROM roles WHERE id = '0';
|
|
||||||
INSERT INTO roles(id, name, permissions) VALUES('0', 'Administrator role', $FILE{/com/unicenta/pos/templates/Role.Administrator.xml} );
|
|
||||||
DELETE FROM roles WHERE id = '1';
|
|
||||||
INSERT INTO roles(id, name, permissions) VALUES('1', 'Manager role', $FILE{/com/unicenta/pos/templates/Role.Manager.xml} );
|
|
||||||
DELETE FROM roles WHERE id = '2';
|
|
||||||
INSERT INTO roles(id, name, permissions) VALUES('2', 'Employee role', $FILE{/com/unicenta/pos/templates/Role.Employee.xml} );
|
|
||||||
|
|
||||||
|
|
||||||
-- Switch ON table foreign key relationships
|
|
||||||
set foreign_key_checks = 1;
|
|
||||||
|
|
||||||
INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, '5.3.1');
|
|
||||||
|
|
||||||
COMMIT;
|
COMMIT;
|
||||||
@@ -881,7 +881,7 @@ message.email=Desktop email app' not found
|
|||||||
message.emptycustomer=Customer cannot be empty
|
message.emptycustomer=Customer cannot be empty
|
||||||
message.emptynumber=Number cannot be empty
|
message.emptynumber=Number cannot be empty
|
||||||
message.enterbuyprice=Enter new Buy Price
|
message.enterbuyprice=Enter new Buy Price
|
||||||
message.eolupdate=<html><center><h2>Version 5.4.0 Upgrade!</h2></br><h3>Your current database version is {0}</h3><br>For version 5.3 and above click <b>YES</b><br/><br/>For any other version click <b>NO</b> and get to 5.3 first<br><br/>
|
message.eolupdate=<html><center><h2>Version 5.3.2 Upgrade!</h2></br><h3>Your current database version is {0}</h3><br>For version 5.3 click <b>YES</b><br/><br/>For any other version click <b>NO</b> and get to 5.3 first<br><br/>
|
||||||
message.ibuttonassign=<html><center>Get the iButton ID<br>Place iButton onto the reader then click OK
|
message.ibuttonassign=<html><center>Get the iButton ID<br>Place iButton onto the reader then click OK
|
||||||
message.ibuttonnotassign=<html><center>The iButton used is not yet assigned to anyone
|
message.ibuttonnotassign=<html><center>The iButton used is not yet assigned to anyone
|
||||||
message.ibuttonnotfound=No iButton adapter found. Key fobs will be disabled.
|
message.ibuttonnotfound=No iButton adapter found. Key fobs will be disabled.
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.google.zxing.BarcodeFormat;
|
|||||||
import com.google.zxing.client.j2se.MatrixToImageWriter;
|
import com.google.zxing.client.j2se.MatrixToImageWriter;
|
||||||
import com.google.zxing.common.BitMatrix;
|
import com.google.zxing.common.BitMatrix;
|
||||||
import com.google.zxing.qrcode.QRCodeWriter;
|
import com.google.zxing.qrcode.QRCodeWriter;
|
||||||
|
import org.junit.Ignore;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
import javax.imageio.ImageIO;
|
import javax.imageio.ImageIO;
|
||||||
@@ -13,9 +14,8 @@ import java.nio.charset.StandardCharsets;
|
|||||||
import java.util.Base64;
|
import java.util.Base64;
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.*;
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
@Ignore
|
||||||
class QRCodeTest {
|
class QRCodeTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void shouldPrintQRCode() throws Exception {
|
void shouldPrintQRCode() throws Exception {
|
||||||
// Name
|
// Name
|
||||||
@@ -66,8 +66,12 @@ class QRCodeTest {
|
|||||||
|
|
||||||
BufferedImage bufferedImage = MatrixToImageWriter.toBufferedImage(bitMatrix);
|
BufferedImage bufferedImage = MatrixToImageWriter.toBufferedImage(bitMatrix);
|
||||||
|
|
||||||
File outputfile = new File("test.jpg");
|
String fileName = "output/test-output.jpg";
|
||||||
assert ImageIO.write(bufferedImage, "jpg", outputfile);
|
File outputFile = new File(fileName);
|
||||||
|
|
||||||
|
// Create the parent directories if they don't exist
|
||||||
|
outputFile.getParentFile().mkdirs();
|
||||||
|
assert ImageIO.write(bufferedImage, "jpg", outputFile);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user