LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-01 16:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge origin/master

Browse Source
This commit is contained in:
honfika@gmail.com
2015-04-24 14:27:19 +02:00
parent 798ec76352 a6419a2b75
commit b925ca5475
3 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
build_common.xml
View File

@@ -108,7 +108,14 @@
</javac>
</target>
<target name="test" depends="test_lib,compile,compile-tests">
<target name="-test-halt-newver" if="NEWVER">
<property name="TESTHALTFAILURE" value="true" />
</target>
<target name="-test-halt-nonewver" unless="NEWVER">
<property name="TESTHALTFAILURE" value="false" />
</target>
<target name="test" depends="-test-halt-newver,-test-halt-nonewver,test_lib,compile,compile-tests">
<delete dir="${TESTRESULTSDIR}"/>
<mkdir dir="${TESTRESULTSDIR}"/>
<mkdir dir="${TESTRESULTSDIR}/raw/"/>
@@ -120,7 +127,7 @@
<testng
outputDir="${TESTRESULTSDIR}"
haltOnFailure="false" verbose="2" workingDir="${basedir}" >
haltOnFailure="${TESTHALTFAILURE}" verbose="2" workingDir="${basedir}">
<classpath>
<pathelement path="${COMPILETESTSDIR}"/>
@@ -518,8 +525,16 @@
</target>
<target name="test_lib">
<ant antfile="${CORELIBSCRIPT}" target="test" inheritAll="false" usenativebasedir="true" />
<target name="-test_lib-newver" if="NEWVER">
<ant antfile="${CORELIBSCRIPT}" target="testhalt" inheritAll="false" usenativebasedir="true" />
</target>
<target name="-test_lib-nonewver" unless="NEWVER">
<ant antfile="${CORELIBSCRIPT}" target="test" inheritAll="false" usenativebasedir="true" />
</target>
<target name="test_lib" depends="-test_lib-newver,-test_lib-nonewver">
</target>
<target name="git-tag">
@@ -708,20 +723,24 @@
</target>
<target name="new-version-major" depends="git-pull,-inc-major,-check-version-online,all,-upload,git-push">
<target name="-new-version-set">
<property name="NEWVER" value="1" />
</target>
<target name="new-version-major" depends="git-pull,-new-version-set,-inc-major,-check-version-online,all,-upload,git-push">
</target>
<target name="new-version-minor" depends="git-pull,-inc-minor,-check-version-online,all,-upload,git-push">
<target name="new-version-minor" depends="git-pull,-new-version-set,-inc-minor,-check-version-online,all,-upload,git-push">
</target>
<target name="new-version-release" depends="git-pull,-inc-release,-check-version-online,all,-upload,git-push">
<target name="new-version-release" depends="git-pull,-new-version-set,-inc-release,-check-version-online,all,-upload,git-push">
</target>
<target name="new-version-nightlybuild" depends="git-pull,-inc-nightlybuild,-check-version-online,all,-upload,git-push">
<target name="new-version-nightlybuild" depends="git-pull,-new-version-set,-inc-nightlybuild,-check-version-online,all,-upload,git-push">
</target>

13
libsrc/ffdec_lib/build_common.xml
View File

@@ -71,7 +71,16 @@
</javac>
</target>
<target name="test" depends="compile,compile-tests">
<target name="-test-sethalt" depends="">
<property name="TESTHALT" value="true" />
</target>
<target name="-test-setnohalt" unless="TESTHALT">
<property name="TESTHALT" value="false" />
</target>
<target name="testhalt" depends="-test-sethalt,test">
</target>
<target name="test" depends="-test-setnohalt,compile,compile-tests">
<delete dir="${TESTRESULTSDIR}"/>
<mkdir dir="${TESTRESULTSDIR}"/>
<mkdir dir="${TESTRESULTSDIR}/raw/"/>
@@ -83,7 +92,7 @@
<testng
outputDir="${TESTRESULTSDIR}"
haltOnFailure="false" verbose="2" workingDir="${basedir}" >
haltOnFailure="${TESTHALT}" verbose="2" workingDir="${basedir}" >
<classpath>
<pathelement path="${COMPILETESTSDIR}"/>

6
src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java
View File

@@ -388,17 +388,19 @@ public class MainFrameRibbonMenu extends MainFrameMenu implements ActionListener
private List<RibbonBandResizePolicy> getIconBandResizePolicies(JRibbonBand ribbonBand) {
List<RibbonBandResizePolicy> resizePolicies = new ArrayList<>();
IconRibbonBandResizePolicy iconBandResizePolicy = new IconRibbonBandResizePolicy(ribbonBand.getControlPanel());
final int width = Math.max(105, iconBandResizePolicy.getPreferredWidth(0, 0));
resizePolicies.add(new BaseRibbonBandResizePolicy<AbstractBandControlPanel>(ribbonBand.getControlPanel()) {
@Override
public int getPreferredWidth(int i, int i1) {
return 105;
return width;
}
@Override
public void install(int i, int i1) {
}
});
resizePolicies.add(new IconRibbonBandResizePolicy(ribbonBand.getControlPanel()));
resizePolicies.add(iconBandResizePolicy);
return resizePolicies;
}