Skip to content

Commit ea87945

Browse files
committed
Updated for release 3.3.0
1 parent 32213ec commit ea87945

54 files changed

Lines changed: 205 additions & 520 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.classpath

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@
3636
<attribute name="module" value="true"/>
3737
</attributes>
3838
</classpathentry>
39+
<classpathentry kind="lib" path="jars/xmljava.jar">
40+
<attributes>
41+
<attribute name="module" value="true"/>
42+
</attributes>
43+
</classpathentry>
3944
<classpathentry kind="lib" path="jars/swt.jar">
4045
<attributes>
4146
<attribute name="module" value="true"/>

build.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<pathelement location="jars/mapdb.jar" />
1212
<pathelement location="jars/openxliff.jar" />
1313
<pathelement location="jars/swordfish.jar" />
14+
<pathelement location="jars/xmljava.jar" />
1415
<pathelement location="jars/swt.jar" />
1516
</path>
1617
<condition property="isWindows">

fluenta.pdf

248 KB
Binary file not shown.

jars/openxliff.jar

-51.9 KB
Binary file not shown.

jars/swordfish.jar

-61 Bytes
Binary file not shown.

jars/xmljava.jar

54.5 KB
Binary file not shown.

src/com/maxprograms/fluenta/API.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2015-2022 Maxprograms.
2+
* Copyright (c) 2023 Maxprograms.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 1.0
@@ -240,7 +240,7 @@ protected static void generateXLIFF(String jsonFile, boolean verbose) throws IOE
240240
}
241241

242242
public static void importXLIFF(long id, String xliffFile, String outputFolder, boolean updateTM,
243-
boolean acceptUnapproved, boolean ignoreTagErrors, boolean cleanAttributes, boolean verbose)
243+
boolean acceptUnapproved, boolean ignoreTagErrors, boolean verbose)
244244
throws IOException, NumberFormatException, ClassNotFoundException, SAXException,
245245
ParserConfigurationException, SQLException, URISyntaxException, JSONException, ParseException {
246246
LocalController controller = new LocalController();
@@ -254,7 +254,7 @@ public static void importXLIFF(long id, String xliffFile, String outputFolder, b
254254
}
255255
SimpleLogger logger = new SimpleLogger(verbose);
256256
controller.importXliff(project, xliffFile, outputFolder, updateTM, acceptUnapproved, ignoreTagErrors,
257-
cleanAttributes, logger);
257+
logger);
258258
}
259259

260260
protected static void importXLIFF(String jsonFile, boolean verbose) throws IOException, NumberFormatException,
@@ -275,11 +275,7 @@ protected static void importXLIFF(String jsonFile, boolean verbose) throws IOExc
275275
if (jsonObject.has("ignoreTagErrors")) {
276276
ignoreTagErrors = jsonObject.getBoolean("ignoreTagErrors");
277277
}
278-
boolean cleanAttributes = true;
279-
if (jsonObject.has("cleanAttributes")) {
280-
cleanAttributes = jsonObject.getBoolean("cleanAttributes");
281-
}
282-
importXLIFF(id, xliffFile, outputFolder, updateTM, acceptUnapproved, ignoreTagErrors, cleanAttributes, verbose);
278+
importXLIFF(id, xliffFile, outputFolder, updateTM, acceptUnapproved, ignoreTagErrors, verbose);
283279
}
284280

285281
public static void removeProject(long id) throws IOException, JSONException, ParseException {

src/com/maxprograms/fluenta/CLI.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2015-2022 Maxprograms.
2+
* Copyright (c) 2023 Maxprograms.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 1.0
@@ -23,7 +23,6 @@
2323
import java.nio.channels.FileLock;
2424
import java.nio.charset.StandardCharsets;
2525
import java.nio.file.Files;
26-
import java.nio.file.Paths;
2726
import java.sql.SQLException;
2827
import java.text.ParseException;
2928
import java.util.Date;
@@ -245,7 +244,7 @@ private static void checkLock() throws IOException {
245244
}
246245
}
247246
}
248-
Files.delete(Paths.get(old.toURI()));
247+
Files.delete(old.toPath());
249248
}
250249
}
251250

@@ -262,6 +261,6 @@ private static void unlock() throws IOException {
262261
flock.release();
263262
channel.close();
264263
lockStream.close();
265-
Files.delete(Paths.get(lock.toURI()));
264+
Files.delete(lock.toPath());
266265
}
267266
}

src/com/maxprograms/fluenta/Constants.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2015-2022 Maxprograms.
2+
* Copyright (c) 2023 Maxprograms.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 1.0
@@ -19,6 +19,6 @@ private Constants() {
1919
}
2020

2121
public static final String NAME = "Fluenta";
22-
public static final String VERSION = "3.2.0";
23-
public static final String BUILD = "20221219_0645";
22+
public static final String VERSION = "3.3.0";
23+
public static final String BUILD = "20230123_1450";
2424
}

src/com/maxprograms/fluenta/Fluenta.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2015-2022 Maxprograms.
2+
* Copyright (c) 2023 Maxprograms.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 1.0
@@ -23,7 +23,6 @@
2323
import java.nio.channels.FileLock;
2424
import java.nio.charset.StandardCharsets;
2525
import java.nio.file.Files;
26-
import java.nio.file.Paths;
2726
import java.util.Date;
2827

2928
import org.eclipse.swt.SWT;
@@ -102,7 +101,7 @@ private static void unlock() throws IOException {
102101
flock.release();
103102
channel.close();
104103
lockStream.close();
105-
Files.delete(Paths.get(lock.toURI()));
104+
Files.delete(lock.toPath());
106105
}
107106

108107
private static void checkLock() throws IOException {
@@ -126,7 +125,7 @@ private static void checkLock() throws IOException {
126125
}
127126
}
128127
}
129-
Files.delete(Paths.get(old.toURI()));
128+
Files.delete(old.toPath());
130129
}
131130
}
132131

0 commit comments

Comments
 (0)