aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/cmake/SignJar.cmake2
-rw-r--r--java/com/jcraft/jsch/ChannelSftp.java12
-rw-r--r--java/com/tigervnc/network/TcpSocket.java2
-rw-r--r--java/com/tigervnc/rfb/AliasParameter.java2
-rw-r--r--java/com/tigervnc/rfb/CConnection.java16
-rw-r--r--java/com/tigervnc/rfb/CMsgReader.java6
-rw-r--r--java/com/tigervnc/rfb/IntParameter.java4
-rw-r--r--java/com/tigervnc/rfb/VoidParameter.java2
-rw-r--r--java/com/tigervnc/vncviewer/CConn.java6
-rw-r--r--java/com/tigervnc/vncviewer/FileUtils.java2
-rw-r--r--java/com/tigervnc/vncviewer/LICENCE.TXT2
-rw-r--r--java/com/tigervnc/vncviewer/MANIFEST.MF2
-rw-r--r--java/com/tigervnc/vncviewer/OptionsDialog.java2
-rw-r--r--java/com/tigervnc/vncviewer/Parameters.java2
-rw-r--r--java/com/tigervnc/vncviewer/README8
-rw-r--r--java/com/tigervnc/vncviewer/ServerDialog.java2
-rw-r--r--java/com/tigervnc/vncviewer/Viewport.java2
-rw-r--r--java/com/tigervnc/vncviewer/VncViewer.java8
18 files changed, 41 insertions, 41 deletions
diff --git a/java/cmake/SignJar.cmake b/java/cmake/SignJar.cmake
index cfca1ba2..dc8f1f2a 100644
--- a/java/cmake/SignJar.cmake
+++ b/java/cmake/SignJar.cmake
@@ -31,7 +31,7 @@ else()
execute_process(COMMAND
${KEYTOOL} -genkey -alias TigerVNC -keystore tigervnc.keystore -keyalg RSA
-storepass tigervnc -keypass tigervnc -validity 7300
- -dname "CN=TigerVNC, OU=Software Development, O=The TigerVNC Project, L=Austin, S=Texas, C=US"
+ -dname "CN=TigerVNC, OU=Software development, O=The TigerVNC project, L=Austin, S=Texas, C=US"
RESULT_VARIABLE RESULT OUTPUT_VARIABLE OUTPUT ERROR_VARIABLE ERROR)
if(NOT RESULT EQUAL 0)
message(FATAL_ERROR "${KEYTOOL} failed:\n${ERROR}")
diff --git a/java/com/jcraft/jsch/ChannelSftp.java b/java/com/jcraft/jsch/ChannelSftp.java
index d2c0913d..58317170 100644
--- a/java/com/jcraft/jsch/ChannelSftp.java
+++ b/java/com/jcraft/jsch/ChannelSftp.java
@@ -1382,7 +1382,7 @@ public class ChannelSftp extends ChannelSession{
try{
sendREAD(handle, request_offset, request_len, rq);
}
- catch(Exception e){ throw new IOException("error"); }
+ catch(Exception e){ throw new IOException("Error"); }
request_offset += request_len;
}
}
@@ -1403,11 +1403,11 @@ public class ChannelSftp extends ChannelSession{
return 0;
}
catch(SftpException e){
- throw new IOException("error: "+e.toString());
+ throw new IOException("Error: "+e.toString());
}
if(type!=SSH_FXP_STATUS && type!=SSH_FXP_DATA){
- throw new IOException("error");
+ throw new IOException("Error");
}
if(type==SSH_FXP_STATUS){
fill(buf, rest_length);
@@ -1418,7 +1418,7 @@ public class ChannelSftp extends ChannelSession{
return -1;
}
//throwStatusError(buf, i);
- throw new IOException("error");
+ throw new IOException("Error");
}
buf.rewind();
@@ -1477,7 +1477,7 @@ public class ChannelSftp extends ChannelSession{
rr.offset+length_of_data,
(int)(rr.length-length_of_data), rq);
}
- catch(Exception e){ throw new IOException("error"); }
+ catch(Exception e){ throw new IOException("Error"); }
request_offset=rr.offset+rr.length;
}
@@ -1502,7 +1502,7 @@ public class ChannelSftp extends ChannelSession{
if(monitor!=null)monitor.end();
rq.cancel(header, buf);
try{_sendCLOSE(handle, header);}
- catch(Exception e){throw new IOException("error");}
+ catch(Exception e){throw new IOException("Error");}
}
};
return in;
diff --git a/java/com/tigervnc/network/TcpSocket.java b/java/com/tigervnc/network/TcpSocket.java
index 22e854f5..9863c723 100644
--- a/java/com/tigervnc/network/TcpSocket.java
+++ b/java/com/tigervnc/network/TcpSocket.java
@@ -185,7 +185,7 @@ public class TcpSocket extends Socket {
try {
sock.channel.socket().setTcpNoDelay(!enable);
} catch(java.net.SocketException e) {
- vlog.error("unable to setsockopt TCP_NODELAY: "+e.getMessage());
+ vlog.error("Unable to setsockopt TCP_NODELAY: "+e.getMessage());
return false;
}
return true;
diff --git a/java/com/tigervnc/rfb/AliasParameter.java b/java/com/tigervnc/rfb/AliasParameter.java
index 3f20ae46..fe0672ee 100644
--- a/java/com/tigervnc/rfb/AliasParameter.java
+++ b/java/com/tigervnc/rfb/AliasParameter.java
@@ -40,7 +40,7 @@ public class AliasParameter extends VoidParameter {
public boolean isBool() { return param.isBool(); }
public void setImmutable() {
- vlog.debug("set immutable "+getName()+" (Alias)");
+ vlog.debug("Set immutable "+getName()+" (Alias)");
param.setImmutable();
}
diff --git a/java/com/tigervnc/rfb/CConnection.java b/java/com/tigervnc/rfb/CConnection.java
index e0e669d8..b94346b9 100644
--- a/java/com/tigervnc/rfb/CConnection.java
+++ b/java/com/tigervnc/rfb/CConnection.java
@@ -160,7 +160,7 @@ abstract public class CConnection extends CMsgHandler {
int majorVersion;
int minorVersion;
- vlog.debug("reading protocol version");
+ vlog.debug("Reading protocol version");
if (!is.checkNoWait(12))
return;
@@ -209,7 +209,7 @@ abstract public class CConnection extends CMsgHandler {
private void processSecurityTypesMsg()
{
- vlog.debug("processing security types message");
+ vlog.debug("Processing security types message");
int secType = Security.secTypeInvalid;
@@ -292,7 +292,7 @@ abstract public class CConnection extends CMsgHandler {
}
private void processSecurityMsg() {
- vlog.debug("processing security message");
+ vlog.debug("Processing security message");
if (csecurity.processMsg(this)) {
state_ = stateEnum.RFBSTATE_SECURITY_RESULT;
processSecurityResultMsg();
@@ -300,7 +300,7 @@ abstract public class CConnection extends CMsgHandler {
}
private void processSecurityResultMsg() {
- vlog.debug("processing security result message");
+ vlog.debug("Processing security result message");
int result;
if (server.beforeVersion(3,8) && csecurity.getType() == Security.secTypeNone) {
result = Security.secResultOK;
@@ -313,10 +313,10 @@ abstract public class CConnection extends CMsgHandler {
securityCompleted();
return;
case Security.secResultFailed:
- vlog.debug("auth failed");
+ vlog.debug("Auth failed");
break;
case Security.secResultTooMany:
- vlog.debug("auth failed - too many tries");
+ vlog.debug("Auth failed: Too many tries");
break;
default:
throw new Exception("Unknown security result from server");
@@ -329,7 +329,7 @@ abstract public class CConnection extends CMsgHandler {
}
private void processInitMsg() {
- vlog.debug("reading server initialisation");
+ vlog.debug("Reading server initialisation");
reader_.readServerInit();
}
@@ -411,7 +411,7 @@ abstract public class CConnection extends CMsgHandler {
super.serverInit(width, height, pf, name);
state_ = stateEnum.RFBSTATE_NORMAL;
- vlog.debug("initialisation done");
+ vlog.debug("Initialisation done");
initDone();
assert(framebuffer != null);
diff --git a/java/com/tigervnc/rfb/CMsgReader.java b/java/com/tigervnc/rfb/CMsgReader.java
index c71a1e02..52e61e6f 100644
--- a/java/com/tigervnc/rfb/CMsgReader.java
+++ b/java/com/tigervnc/rfb/CMsgReader.java
@@ -81,8 +81,8 @@ public class CMsgReader {
readEndOfContinuousUpdates();
break;
default:
- vlog.error("unknown message type "+type);
- throw new Exception("unknown message type");
+ vlog.error("Unknown message type "+type);
+ throw new Exception("Unknown message type");
}
} else {
int x = is.readU16();
@@ -154,7 +154,7 @@ public class CMsgReader {
if (len > 256*1024) {
is.skip(len);
- vlog.error("cut text too long ("+len+" bytes) - ignoring");
+ vlog.error("Cut text too long ("+len+" bytes) - ignoring");
return;
}
diff --git a/java/com/tigervnc/rfb/IntParameter.java b/java/com/tigervnc/rfb/IntParameter.java
index dcad04a8..ddc8baf4 100644
--- a/java/com/tigervnc/rfb/IntParameter.java
+++ b/java/com/tigervnc/rfb/IntParameter.java
@@ -40,7 +40,7 @@ public class IntParameter extends VoidParameter {
public boolean setParam(String v) {
if (immutable) return true;
- vlog.debug("set "+getName()+"(Int) to "+v);
+ vlog.debug("Set "+getName()+"(Int) to "+v);
try {
int i;
i = Integer.parseInt(v);
@@ -55,7 +55,7 @@ public class IntParameter extends VoidParameter {
public boolean setParam(int v) {
if (immutable) return true;
- vlog.debug("set "+getName()+"(Int) to "+v);
+ vlog.debug("Set "+getName()+"(Int) to "+v);
if (v < minValue || v > maxValue)
return false;
value = v;
diff --git a/java/com/tigervnc/rfb/VoidParameter.java b/java/com/tigervnc/rfb/VoidParameter.java
index 2af0a81d..529c790d 100644
--- a/java/com/tigervnc/rfb/VoidParameter.java
+++ b/java/com/tigervnc/rfb/VoidParameter.java
@@ -61,7 +61,7 @@ abstract public class VoidParameter {
abstract public String getValueStr();
public boolean isBool() { return false; }
public void setImmutable() {
- vlog.debug("set immutable "+getName());
+ vlog.debug("Set immutable "+getName());
immutable = true;
}
diff --git a/java/com/tigervnc/vncviewer/CConn.java b/java/com/tigervnc/vncviewer/CConn.java
index 11b6da44..ff22206d 100644
--- a/java/com/tigervnc/vncviewer/CConn.java
+++ b/java/com/tigervnc/vncviewer/CConn.java
@@ -113,10 +113,10 @@ public class CConn extends CConnection implements
Tunnel.createTunnel(gatewayHost, getServerName(),
getServerPort(), localPort);
sock = new TcpSocket("localhost", localPort);
- vlog.info("connected to localhost port "+localPort);
+ vlog.info("Connected to localhost port "+localPort);
} else {
sock = new TcpSocket(getServerName(), getServerPort());
- vlog.info("connected to host "+getServerName()+" port "+getServerPort());
+ vlog.info("Connected to host "+getServerName()+" port "+getServerPort());
}
} catch (java.lang.Exception e) {
throw new Exception(e.getMessage());
@@ -126,7 +126,7 @@ public class CConn extends CConnection implements
if (listenMode.getValue())
vlog.info("Accepted connection from " + name);
else
- vlog.info("connected to host "+Hostname.getHost(name)+" port "+Hostname.getPort(name));
+ vlog.info("Connected to host "+Hostname.getHost(name)+" port "+Hostname.getPort(name));
}
// See callback below
diff --git a/java/com/tigervnc/vncviewer/FileUtils.java b/java/com/tigervnc/vncviewer/FileUtils.java
index 6b82d3e2..cb5564be 100644
--- a/java/com/tigervnc/vncviewer/FileUtils.java
+++ b/java/com/tigervnc/vncviewer/FileUtils.java
@@ -80,7 +80,7 @@ public class FileUtils {
return newDir.getPath();
} else {
if (legacyDir.exists()) {
- vlog.info("WARNING: ~/.vnc is deprecated, please consult 'man vncviewer' for paths to migrate to.");
+ vlog.info("Warning: ~/.vnc is deprecated, please consult 'man vncviewer' for paths to migrate to.");
return legacyDir.getPath();
}
String xdgBaseDir = System.getenv(xdgEnv);
diff --git a/java/com/tigervnc/vncviewer/LICENCE.TXT b/java/com/tigervnc/vncviewer/LICENCE.TXT
index ae3b5319..8aadde97 100644
--- a/java/com/tigervnc/vncviewer/LICENCE.TXT
+++ b/java/com/tigervnc/vncviewer/LICENCE.TXT
@@ -279,7 +279,7 @@ POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
- Appendix: How to Apply These Terms to Your New Programs
+ Appendix: How to apply these terms to your new programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
diff --git a/java/com/tigervnc/vncviewer/MANIFEST.MF b/java/com/tigervnc/vncviewer/MANIFEST.MF
index 4ba75f6a..9e282655 100644
--- a/java/com/tigervnc/vncviewer/MANIFEST.MF
+++ b/java/com/tigervnc/vncviewer/MANIFEST.MF
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
Main-Class: com.tigervnc.vncviewer.VncViewer
-Application-Name: TigerVNC Viewer
+Application-Name: TigerVNC viewer
Permissions: all-permissions
Codebase: *
diff --git a/java/com/tigervnc/vncviewer/OptionsDialog.java b/java/com/tigervnc/vncviewer/OptionsDialog.java
index 2fbd9d9c..927fdf21 100644
--- a/java/com/tigervnc/vncviewer/OptionsDialog.java
+++ b/java/com/tigervnc/vncviewer/OptionsDialog.java
@@ -175,7 +175,7 @@ class OptionsDialog extends Dialog {
@SuppressWarnings({"rawtypes","unchecked"})
public OptionsDialog() {
super(true);
- setTitle("VNC Viewer Options");
+ setTitle("VNC viewer options");
setResizable(false);
getContentPane().setLayout(
diff --git a/java/com/tigervnc/vncviewer/Parameters.java b/java/com/tigervnc/vncviewer/Parameters.java
index 8c8465cb..dd2f1c3e 100644
--- a/java/com/tigervnc/vncviewer/Parameters.java
+++ b/java/com/tigervnc/vncviewer/Parameters.java
@@ -192,7 +192,7 @@ public class Parameters {
"specified from the point of view of the gateway machine, "+
"e.g. \"localhost\" denotes the gateway, "+
"not the machine on which the viewer was launched. "+
- "See the System Properties section below for "+
+ "See the System properties section below for "+
"information on configuring the -Via option.", "");
public static BoolParameter tunnel
diff --git a/java/com/tigervnc/vncviewer/README b/java/com/tigervnc/vncviewer/README
index 5d5ebf90..404b8eb9 100644
--- a/java/com/tigervnc/vncviewer/README
+++ b/java/com/tigervnc/vncviewer/README
@@ -1,5 +1,5 @@
-TigerVNC Java Viewer
+TigerVNC Java viewer
====================
This distribution is based on the standard VNC source and includes new
@@ -27,9 +27,9 @@ available.
Installation
============
-The TigerVNC Java Viewer requires installation of either a JRE (Java
+The TigerVNC Java viewer requires installation of either a JRE (Java
Runtime Environment) or a JDK (Java Development Kit). If VncViewer.jar is
-in the current directory, then the TigerVNC Java Viewer can be launched
+in the current directory, then the TigerVNC Java viewer can be launched
with the following command line:
java -jar VncViewer.jar [parameters]
@@ -41,7 +41,7 @@ optional parameters supported by VncViewer.
Parameters
==========
-The TigerVNC Java Viewer accepts a number of optional parameters, allowing you
+The TigerVNC Java viewer accepts a number of optional parameters, allowing you
to customize its behavior. Example:
java -jar VncViewer.jar Port=5901 ScalingFactor=50
diff --git a/java/com/tigervnc/vncviewer/ServerDialog.java b/java/com/tigervnc/vncviewer/ServerDialog.java
index 5f75fd3d..01f91db2 100644
--- a/java/com/tigervnc/vncviewer/ServerDialog.java
+++ b/java/com/tigervnc/vncviewer/ServerDialog.java
@@ -47,7 +47,7 @@ class ServerDialog extends Dialog implements Runnable {
super(true);
this.vncServerName = vncServerName;
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
- setTitle("VNC Viewer: Connection Details");
+ setTitle("VNC viewer: Connection details");
setResizable(false);
addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) {
diff --git a/java/com/tigervnc/vncviewer/Viewport.java b/java/com/tigervnc/vncviewer/Viewport.java
index e12ef2a6..c293cb7d 100644
--- a/java/com/tigervnc/vncviewer/Viewport.java
+++ b/java/com/tigervnc/vncviewer/Viewport.java
@@ -168,7 +168,7 @@ class Viewport extends JPanel implements ActionListener {
if (data[i*4 + 3] != 0) break;
if ((i == width*height) && dotWhenNoCursor.getValue()) {
- vlog.debug("cursor is empty - using dot");
+ vlog.debug("Cursor is empty: Using dot");
cursor = new BufferedImage(5, 5, BufferedImage.TYPE_INT_ARGB_PRE);
cursor.setRGB(0, 0, 5, 5, dotcursor_xpm, 0, 5);
cursorHotspot.x = cursorHotspot.y = 3;
diff --git a/java/com/tigervnc/vncviewer/VncViewer.java b/java/com/tigervnc/vncviewer/VncViewer.java
index 067f4eff..4e4364cb 100644
--- a/java/com/tigervnc/vncviewer/VncViewer.java
+++ b/java/com/tigervnc/vncviewer/VncViewer.java
@@ -61,7 +61,7 @@ import static com.tigervnc.vncviewer.Parameters.*;
public class VncViewer implements Runnable {
public static final String aboutText =
- new String("TigerVNC Java Viewer v%s (%s)%n"+
+ new String("TigerVNC Java viewer v%s (%s)%n"+
"Built on %s at %s%n"+
"Copyright (C) 1999-2024 TigerVNC Team and many others (see README.rst)%n"+
"See https://www.tigervnc.org for information on TigerVNC.");
@@ -237,7 +237,7 @@ public class VncViewer implements Runnable {
Configuration.listParams(79, 14);
String propertiesString = ("\n"+
-"System Properties (adapted from the TurboVNC vncviewer man page)\n"+
+"System properties (adapted from the TurboVNC vncviewer man page)\n"+
" When started with the -via option, vncviewer reads the VNC_VIA_CMD\n"+
" System property, expands patterns beginning with the \"%\" character,\n"+
" and uses the resulting command line to establish the secure tunnel\n"+
@@ -359,7 +359,7 @@ public class VncViewer implements Runnable {
JOptionPane op =
new JOptionPane(msg, JOptionPane.INFORMATION_MESSAGE,
JOptionPane.DEFAULT_OPTION, VncViewer.logoIcon, options);
- JDialog dlg = op.createDialog(parent, "About TigerVNC Viewer for Java");
+ JDialog dlg = op.createDialog(parent, "About TigerVNC viewer for Java");
dlg.setIconImage(VncViewer.frameIcon);
dlg.setAlwaysOnTop(true);
dlg.setVisible(true);
@@ -378,7 +378,7 @@ public class VncViewer implements Runnable {
void reportException(java.lang.Exception e) {
String title, msg = e.getMessage();
int msgType = JOptionPane.ERROR_MESSAGE;
- title = "TigerVNC Viewer : Error";
+ title = "TigerVNC viewer : Error";
e.printStackTrace();
JOptionPane.showMessageDialog(null, msg, title, msgType);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-03 06:20:21 +0000