gnome-split-team team mailing list archive
-
gnome-split-team team
-
Mailing list archive
-
Message #00125
[Branch ~respawneral/gnome-split/mainline] Rev 252: Change array format.
------------------------------------------------------------
revno: 252
committer: Guillaume Mazoyer <respawneral@xxxxxxxxx>
branch nick: array-format
timestamp: Sat 2011-02-19 17:17:00 +0100
message:
Change array format.
Fix a typo in the configure file.
modified:
.settings/org.eclipse.jdt.core.prefs
configure
src/org/gnome/split/core/EngineFactory.java
src/org/gnome/split/core/model/MergeModel.java
src/org/gnome/split/core/utils/Algorithm.java
src/org/gnome/split/core/utils/ByteUtils.java
src/org/gnome/split/core/utils/SizeUnit.java
src/org/gnome/split/gtk/dialog/AboutSoftDialog.java
src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java
--
lp:gnome-split
https://code.launchpad.net/~respawneral/gnome-split/mainline
Your team GNOME Split developers is subscribed to branch lp:gnome-split.
To unsubscribe from this branch go to https://code.launchpad.net/~respawneral/gnome-split/mainline/+edit-subscription
=== modified file '.settings/org.eclipse.jdt.core.prefs'
--- .settings/org.eclipse.jdt.core.prefs 2010-02-04 16:49:08 +0000
+++ .settings/org.eclipse.jdt.core.prefs 2011-02-19 16:17:00 +0000
@@ -21,7 +21,7 @@
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=53
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
=== modified file 'configure'
--- configure 2011-02-19 15:21:01 +0000
+++ configure 2011-02-19 16:17:00 +0000
@@ -561,7 +561,7 @@
"libunixsocket-java",
"/usr/share/java/unix.jar");
} elsif ($os eq "fedora") {
- $dir = ($cpu_arch eq "64") ? "lib64" : "lib";
+ my $dir = ($cpu_arch eq "64") ? "lib64" : "lib";
check_prereq(@java_gnome_jar,
"java-gnome library",
=== modified file 'src/org/gnome/split/core/EngineFactory.java'
--- src/org/gnome/split/core/EngineFactory.java 2011-01-04 12:56:24 +0000
+++ src/org/gnome/split/core/EngineFactory.java 2011-02-19 16:17:00 +0000
@@ -41,18 +41,22 @@
* List of the splitters that can be used.
*/
private static final Class<?>[] splitters = new Class[] {
- org.gnome.split.core.splitter.Generic.class, org.gnome.split.core.splitter.GnomeSplit.class,
- org.gnome.split.core.splitter.Xtremsplit.class, org.gnome.split.core.splitter.KFK.class,
- org.gnome.split.core.splitter.YoyoCut.class
+ org.gnome.split.core.splitter.Generic.class,
+ org.gnome.split.core.splitter.GnomeSplit.class,
+ org.gnome.split.core.splitter.Xtremsplit.class,
+ org.gnome.split.core.splitter.KFK.class,
+ org.gnome.split.core.splitter.YoyoCut.class
};
/**
* List of the mergers that can be used.
*/
private static final Class<?>[] mergers = new Class[] {
- org.gnome.split.core.merger.Generic.class, org.gnome.split.core.merger.GnomeSplit.class,
- org.gnome.split.core.merger.Xtremsplit.class, org.gnome.split.core.merger.KFK.class,
- org.gnome.split.core.merger.YoyoCut.class
+ org.gnome.split.core.merger.Generic.class,
+ org.gnome.split.core.merger.GnomeSplit.class,
+ org.gnome.split.core.merger.Xtremsplit.class,
+ org.gnome.split.core.merger.KFK.class,
+ org.gnome.split.core.merger.YoyoCut.class
};
/**
=== modified file 'src/org/gnome/split/core/model/MergeModel.java'
--- src/org/gnome/split/core/model/MergeModel.java 2011-01-04 12:56:24 +0000
+++ src/org/gnome/split/core/model/MergeModel.java 2011-02-19 16:17:00 +0000
@@ -34,7 +34,7 @@
* Get the first chunk to merge.
*/
public File getFile();
-
+
/**
* Get the directory where the merge will be done.
*/
=== modified file 'src/org/gnome/split/core/utils/Algorithm.java'
--- src/org/gnome/split/core/utils/Algorithm.java 2011-01-04 12:56:24 +0000
+++ src/org/gnome/split/core/utils/Algorithm.java 2011-02-19 16:17:00 +0000
@@ -59,7 +59,11 @@
*/
public static String[] toStrings() {
return new String[] {
- _("Generic"), "GNOME Split", "Xtremsplit", "KFK", "YoyoCut"
+ _("Generic"),
+ "GNOME Split",
+ "Xtremsplit",
+ "KFK",
+ "YoyoCut"
};
}
@@ -68,7 +72,13 @@
*/
public static String[] getExtensions() {
return new String[] {
- ".000", ".001", ".001.gsp", ".001.xtm", ".001.exe", ".kk0", ".001.yct"
+ ".000",
+ ".001",
+ ".001.gsp",
+ ".001.xtm",
+ ".001.exe",
+ ".kk0",
+ ".001.yct"
};
}
@@ -77,11 +87,11 @@
*/
public static String[] getDescriptions() {
return new String[] {
- _("Algorithm that just split the file without doing anything special. The files will be mergeable with tools like <b>cat</b>. It does not provide a file integrity check with a checksum."),
- _("Algorithm that is specific to <i>GNOME Split</i>. It provides a file integrity check using a <b>MD5</b> sum."),
- _("Algorithm that is used by <i>Xtremsplit</i>. People who use <i>Xtremsplit</i> will be able to merge the files. It provides a file integrity check using a <b>MD5</b> sum."),
- _("Algorithm that is used by <i>KFK</i>. People who use <i>KFK</i> will be able to merge the files. The files will be mergeable with tools like <b>cat</b> too."),
- _("Algorithm that is used by <i>YoyoCut</i>. People who use <i>YoyoCut</i> will be able to merge the files. It provides a file integrity check using a <b>MD5</b> sum.")
+ _("Algorithm that just split the file without doing anything special. The files will be mergeable with tools like <b>cat</b>. It does not provide a file integrity check with a checksum."),
+ _("Algorithm that is specific to <i>GNOME Split</i>. It provides a file integrity check using a <b>MD5</b> sum."),
+ _("Algorithm that is used by <i>Xtremsplit</i>. People who use <i>Xtremsplit</i> will be able to merge the files. It provides a file integrity check using a <b>MD5</b> sum."),
+ _("Algorithm that is used by <i>KFK</i>. People who use <i>KFK</i> will be able to merge the files. The files will be mergeable with tools like <b>cat</b> too."),
+ _("Algorithm that is used by <i>YoyoCut</i>. People who use <i>YoyoCut</i> will be able to merge the files. It provides a file integrity check using a <b>MD5</b> sum.")
};
}
=== modified file 'src/org/gnome/split/core/utils/ByteUtils.java'
--- src/org/gnome/split/core/utils/ByteUtils.java 2011-01-04 12:56:24 +0000
+++ src/org/gnome/split/core/utils/ByteUtils.java 2011-02-19 16:17:00 +0000
@@ -98,7 +98,10 @@
// Keep only the 4 needed bytes
byte[] result = buffer.array();
result = new byte[] {
- result[4], result[5], result[6], result[7]
+ result[4],
+ result[5],
+ result[6],
+ result[7]
};
return result;
=== modified file 'src/org/gnome/split/core/utils/SizeUnit.java'
--- src/org/gnome/split/core/utils/SizeUnit.java 2011-01-04 12:56:24 +0000
+++ src/org/gnome/split/core/utils/SizeUnit.java 2011-02-19 16:17:00 +0000
@@ -60,7 +60,11 @@
* Get all the values using an array.
*/
private static final double[] values = {
- KiB, MiB, GiB, CDR, DVDR
+ KiB,
+ MiB,
+ GiB,
+ CDR,
+ DVDR
};
/**
@@ -92,8 +96,13 @@
*/
public static String[] toStrings() {
return new String[] {
- _("chunks"), _("bytes (B)"), _("kibibytes (KiB)"), _("mebibytes (MiB)"),
- _("gibibytes (GiB)"), _("CD-R (700 MB)"), _("DVD-R (4.7 GB)")
+ _("chunks"),
+ _("bytes (B)"),
+ _("kibibytes (KiB)"),
+ _("mebibytes (MiB)"),
+ _("gibibytes (GiB)"),
+ _("CD-R (700 MB)"),
+ _("DVD-R (4.7 GB)")
};
}
}
=== modified file 'src/org/gnome/split/gtk/dialog/AboutSoftDialog.java'
--- src/org/gnome/split/gtk/dialog/AboutSoftDialog.java 2011-01-04 12:56:24 +0000
+++ src/org/gnome/split/gtk/dialog/AboutSoftDialog.java 2011-02-19 16:17:00 +0000
@@ -61,7 +61,7 @@
// Program documenters
this.setDocumenters(new String[] {
- "Guillaume Mazoyer <respawneral@xxxxxxxxx>", "Aur\u00E9lien Paulus <paupoo@xxxxxxxxx>"
+ "Guillaume Mazoyer <respawneral@xxxxxxxxx>"
});
// Program artists
=== modified file 'src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java'
--- src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java 2011-01-04 12:56:24 +0000
+++ src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java 2011-02-19 16:17:00 +0000
@@ -587,16 +587,15 @@
new File(filename).getName()
});
} else {
- conclusion.setFields(
- new String[] {
- _("File to split:"), _("Maximum size of a chunk:"),
- _("Algorithm of split:")
- },
- new String[] {
- new File(filename).getName(),
- SizeUnit.formatSize(this.calculateSize(size, unit)),
- Algorithm.toStrings()[algorithm]
- });
+ conclusion.setFields(new String[] {
+ _("File to split:"),
+ _("Maximum size of a chunk:"),
+ _("Algorithm of split:")
+ }, new String[] {
+ new File(filename).getName(),
+ SizeUnit.formatSize(this.calculateSize(size, unit)),
+ Algorithm.toStrings()[algorithm]
+ });
}
break;
}
