From 76ca027340d9a3cb834adf12eff51508ab4a69ad Mon Sep 17 00:00:00 2001 From: Erik Boasson Date: Thu, 14 Feb 2019 17:01:09 +0100 Subject: [PATCH] cmake 3.6 bugs out over cunit, so move to 3.7 Signed-off-by: Erik Boasson --- src/CMakeLists.txt | 2 +- src/tools/config/CMakeLists.txt | 2 +- .../cyclonedds/common/util/Initializer.java | 74 +------------------ .../cyclonedds/config/SpliceConfig.java | 1 - .../config/data/DataConfiguration.java | 2 +- .../cyclonedds/config/swing/ConfigWindow.java | 12 +-- 6 files changed, 10 insertions(+), 83 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d2de2ce..ab49099 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,7 +9,7 @@ # # SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause # -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.7) # Set a default build type if none was specified set(default_build_type "RelWithDebInfo") diff --git a/src/tools/config/CMakeLists.txt b/src/tools/config/CMakeLists.txt index 65da738..3f7bded 100644 --- a/src/tools/config/CMakeLists.txt +++ b/src/tools/config/CMakeLists.txt @@ -13,7 +13,7 @@ find_package(Java 1.8 REQUIRED) include(UseJava) set(CONFJAR_TARGET "${CMAKE_PROJECT_NAME_SMALL}conf") -set(CMAKE_JAVA_COMPILE_FLAGS "-source" "1.8" "-target" "1.8") +#set(CMAKE_JAVA_COMPILE_FLAGS "-source" "1.8" "-target" "1.8" -Xlint:deprecation) # Oddly enough, add_jar can't deal with a resource having an absolute path (experienced on Windows), so # generate into the list-dir. diff --git a/src/tools/config/org/eclipse/cyclonedds/common/util/Initializer.java b/src/tools/config/org/eclipse/cyclonedds/common/util/Initializer.java index 88fb00f..8123553 100644 --- a/src/tools/config/org/eclipse/cyclonedds/common/util/Initializer.java +++ b/src/tools/config/org/eclipse/cyclonedds/common/util/Initializer.java @@ -22,8 +22,7 @@ import javax.swing.JOptionPane; /** * Base class for tooling initializers. Its responsibilities are to initialize - * logging facilities according to commandline parameters and to validate - * whether the correct Java Vitual Machine version is used. + * logging facilities according to commandline parameters. * * @date Sep 1, 2004 */ @@ -87,75 +86,4 @@ public class Initializer { } } } - - /** - * Validates whether a compatible Java virtual machine is used. - * - * The version of Java must be >= 1.4 and should be >= 1.5.0. If the - * used version is &st; 1.4, the application exits with an error message. If - * 1.4 &st;= version &st; 1.5, false is returned, but the application - * proceeds. - * - * @return true, if java version >= 1.5 and false otherwise. - */ - public boolean validateJVMVersion(){ - int token; - boolean result = true; - - String version = System.getProperty("java.version"); - StringTokenizer tokenizer = new StringTokenizer(version, "."); - - if(tokenizer.hasMoreTokens()){ - token = Integer.parseInt(tokenizer.nextToken()); - - if(token < 1){ - this.printVersionErrorAndExit(version); - } - - if(tokenizer.hasMoreTokens()){ - token = Integer.parseInt(tokenizer.nextToken()); - - if(token < 4){ - this.printVersionErrorAndExit(version); - } else if(token == 4){ - result = false; - } - } - else{ - this.printVersionErrorAndExit(version); - result = false; - } - } - else{ - this.printVersionErrorAndExit(version); - result = false; - } - return result; - } - - /** - * Prints JVM version demands as well as the used version and exits the - * application. - */ - private void printVersionErrorAndExit(String version){ - System.err.println("Your Java version is '" + version + "', but version >= '1.4' is required.\nBailing out..."); - System.exit(0); - } - - /** - * Displays a Java version warning. - * - * @param parent - * The GUI parent which must be used as parent for displaying the - * message. If the supplied component == null, the version - * warning is displayed on standard out (System.out). - */ - public void showVersionWarning(Component parent){ - if(parent != null){ - JOptionPane.showMessageDialog(parent, "You are using Java version " + System.getProperty("java.version") + ",\nbut version >= 1.5.0 is recommended.", "Warning", JOptionPane.WARNING_MESSAGE); - } else{ - System.err.println("You are using Java version " + System.getProperty("java.version") - + ",\nbut version >= 1.5.0 is recommended."); - } - } } diff --git a/src/tools/config/org/eclipse/cyclonedds/config/SpliceConfig.java b/src/tools/config/org/eclipse/cyclonedds/config/SpliceConfig.java index ceea796..71a3d0d 100644 --- a/src/tools/config/org/eclipse/cyclonedds/config/SpliceConfig.java +++ b/src/tools/config/org/eclipse/cyclonedds/config/SpliceConfig.java @@ -34,7 +34,6 @@ public class SpliceConfig extends Initializer { String uri = null; SpliceConfig t = new SpliceConfig(); - t.validateJVMVersion(); for (int i = 0; i < args.length; i++) { if ("-noredirect".equals(args[i])) { diff --git a/src/tools/config/org/eclipse/cyclonedds/config/data/DataConfiguration.java b/src/tools/config/org/eclipse/cyclonedds/config/data/DataConfiguration.java index 799b443..729f799 100644 --- a/src/tools/config/org/eclipse/cyclonedds/config/data/DataConfiguration.java +++ b/src/tools/config/org/eclipse/cyclonedds/config/data/DataConfiguration.java @@ -414,7 +414,7 @@ public class DataConfiguration { try{ TransformerFactory tFactory = TransformerFactory.newInstance(); - tFactory.setAttribute("indent-number", new Integer(4)); + tFactory.setAttribute("indent-number", Integer.valueOf(4)); Transformer transformer = tFactory.newTransformer(); transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); transformer.setOutputProperty(OutputKeys.METHOD, "xml"); diff --git a/src/tools/config/org/eclipse/cyclonedds/config/swing/ConfigWindow.java b/src/tools/config/org/eclipse/cyclonedds/config/swing/ConfigWindow.java index 7e1c6ef..26dc2ed 100644 --- a/src/tools/config/org/eclipse/cyclonedds/config/swing/ConfigWindow.java +++ b/src/tools/config/org/eclipse/cyclonedds/config/swing/ConfigWindow.java @@ -466,7 +466,7 @@ public class ConfigWindow extends MainWindow implements DataConfigurationListene helpContentsItem.setMnemonic(KeyEvent.VK_C); helpContentsItem.setActionCommand("help"); helpContentsItem.addActionListener(getController()); - helpContentsItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_H, Event.CTRL_MASK, false)); + helpContentsItem.setAccelerator(KeyStroke.getKeyStroke("control H")); } return helpContentsItem; } @@ -499,7 +499,7 @@ public class ConfigWindow extends MainWindow implements DataConfigurationListene newItem = new JMenuItem(); newItem.setText("New..."); newItem.setMnemonic(KeyEvent.VK_N); - newItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, Event.CTRL_MASK, false)); + newItem.setAccelerator(KeyStroke.getKeyStroke("control N")); newItem.setActionCommand("new"); newItem.addActionListener(controller); } @@ -516,7 +516,7 @@ public class ConfigWindow extends MainWindow implements DataConfigurationListene openItem = new JMenuItem(); openItem.setText("Open..."); openItem.setMnemonic(KeyEvent.VK_O); - openItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, Event.CTRL_MASK, false)); + openItem.setAccelerator(KeyStroke.getKeyStroke("control O")); openItem.setActionCommand("open"); openItem.addActionListener(controller); } @@ -533,7 +533,7 @@ public class ConfigWindow extends MainWindow implements DataConfigurationListene saveItem = new JMenuItem(); saveItem.setText("Save"); saveItem.setMnemonic(KeyEvent.VK_S); - saveItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, Event.CTRL_MASK, false)); + saveItem.setAccelerator(KeyStroke.getKeyStroke("control S")); saveItem.setActionCommand("save"); saveItem.addActionListener(controller); } @@ -582,7 +582,7 @@ public class ConfigWindow extends MainWindow implements DataConfigurationListene exitItem = new JMenuItem(); exitItem.setText("Exit"); exitItem.setMnemonic(KeyEvent.VK_X); - exitItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F4, Event.ALT_MASK, false)); + exitItem.setAccelerator(KeyStroke.getKeyStroke("alt F4")); exitItem.setActionCommand("exit"); exitItem.addActionListener(controller); } @@ -599,7 +599,7 @@ public class ConfigWindow extends MainWindow implements DataConfigurationListene printItem = new JMenuItem(); printItem.setText("Print..."); printItem.setMnemonic(KeyEvent.VK_P); - printItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_P, Event.CTRL_MASK, false)); + printItem.setAccelerator(KeyStroke.getKeyStroke("control P")); printItem.setActionCommand("print"); printItem.addActionListener(controller); }