Révision 817
| tmp/org.txm.information.core/src/org/txm/properties/core/functions/Properties.java (revision 817) | ||
|---|---|---|
| 54 | 54 |
import org.txm.searchengine.cqp.clientExceptions.CqiClientException; |
| 55 | 55 |
import org.txm.searchengine.cqp.corpus.Corpus; |
| 56 | 56 |
import org.txm.searchengine.cqp.corpus.CorpusManager; |
| 57 |
import org.txm.searchengine.cqp.corpus.MainCorpus; |
|
| 57 | 58 |
import org.txm.searchengine.cqp.corpus.Property; |
| 58 | 59 |
import org.txm.searchengine.cqp.corpus.StructuralUnit; |
| 59 | 60 |
import org.txm.searchengine.cqp.corpus.StructuralUnitProperty; |
| ... | ... | |
| 608 | 609 |
this.worked(1); |
| 609 | 610 |
|
| 610 | 611 |
String txmhome = TXMPreferences.getString(TBXPreferences.USER_TXM_HOME, TBXPreferences.PREFERENCES_NODE); |
| 611 |
String filename = corpus.getParent().getName() + "-" + corpus.getName(); //$NON-NLS-1$ |
|
| 612 |
String filename = corpus.getMainCorpus() + "-" + corpus.getName(); //$NON-NLS-1$ |
|
| 613 |
if (corpus instanceof MainCorpus) {
|
|
| 614 |
filename = corpus.getName(); //$NON-NLS-1$ |
|
| 615 |
} |
|
| 616 |
|
|
| 612 | 617 |
filename = AsciiUtils.buildId(filename); |
| 613 | 618 |
file = new File(txmhome, "results/" + filename + "-infos.html"); //$NON-NLS-1$ //$NON-NLS-2$ |
| 614 | 619 |
|
| tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/AssistedQueryWidget.java (revision 817) | ||
|---|---|---|
| 38 | 38 |
import org.eclipse.swt.widgets.Composite; |
| 39 | 39 |
import org.txm.rcp.IImageKeys; |
| 40 | 40 |
import org.txm.rcp.messages.TXMUIMessages; |
| 41 |
import org.txm.rcp.swt.GLComposite; |
|
| 41 | 42 |
import org.txm.rcp.swt.dialog.QueryAssistDialog; |
| 42 | 43 |
import org.txm.searchengine.cqp.corpus.Corpus; |
| 43 | 44 |
import org.txm.searchengine.cqp.corpus.query.Query; |
| ... | ... | |
| 65 | 66 |
*/ |
| 66 | 67 |
public AssistedQueryWidget(Composite parent, int style, final Corpus corpus) {
|
| 67 | 68 |
super(parent, SWT.NONE); |
| 68 |
this.setLayout(new GridLayout(2, false));
|
|
| 69 |
this.setLayout(GLComposite.createDefaultLayout(2));
|
|
| 69 | 70 |
|
| 70 | 71 |
magicstick = new Button(this, SWT.PUSH); |
| 71 |
magicstick.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
|
|
| 72 |
false, true));
|
|
| 72 |
magicstick.setLayoutData(new GridData(GridData.FILL, GridData.CENTER,
|
|
| 73 |
false, false));
|
|
| 73 | 74 |
magicstick.setImage(IImageKeys.getImage(IImageKeys.ACTION_ASSISTQUERY)); |
| 74 | 75 |
magicstick.setToolTipText(TXMUIMessages.AssistedQueryWidget_0); |
| 75 | 76 |
magicstick.addSelectionListener(new SelectionListener() {
|
| ... | ... | |
| 86 | 87 |
}); |
| 87 | 88 |
|
| 88 | 89 |
querywidget = new QueryWidget(this, style); |
| 89 |
querywidget.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
|
|
| 90 |
querywidget.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
|
|
| 90 | 91 |
} |
| 91 | 92 |
|
| 92 | 93 |
public boolean setFocus() {
|
| tmp/org.txm.setups/BuildLinux64bit.sh (revision 817) | ||
|---|---|---|
| 22 | 22 |
exit 1; |
| 23 | 23 |
fi |
| 24 | 24 |
|
| 25 |
# ensure JRE files are here |
|
| 26 |
if [ ! -d "shared/debian/usr/lib/TXM/jre/bin" ]; then |
|
| 27 |
echo "** $APP: JRE files are missing." |
|
| 25 |
# remove old profile that can contains unwanted repositories |
|
| 26 |
rm -f "exportRCP/linux.gtk.${ARCHCODE}/TXM/p2/org.eclipse.equinox.p2.engine/.settings/*" &&
|
|
| 27 |
rm -f "exportRCP/linux.gtk.${ARCHCODE}/TXM/p2/org.eclipse.equinox.p2.engine/profileRegistry/profile.profile/.data/.settings/*"
|
|
| 28 |
if [ $? != 0 ]; then |
|
| 29 |
echo "** $APP: failed to remove p2 preferences" |
|
| 28 | 30 |
exit 1; |
| 29 | 31 |
fi |
| 30 | 32 |
|
| 33 |
mkdir -p "$APP/usr/lib/TXM" |
|
| 34 |
|
|
| 31 | 35 |
# copy debian shared files: INSTALL, R libs... |
| 32 | 36 |
rsync -r --exclude '.svn' shared/debian/* "$APP" |
| 33 | 37 |
if [ $? != 0 ]; then |
| ... | ... | |
| 42 | 46 |
exit 1; |
| 43 | 47 |
fi |
| 44 | 48 |
|
| 45 |
# remove old profile that can contains unwanted repositories |
|
| 46 |
rm -f "exportRCP/linux.gtk.${ARCHCODE}/TXM/p2/org.eclipse.equinox.p2.engine/.settings/*" &&
|
|
| 47 |
rm -f "exportRCP/linux.gtk.${ARCHCODE}/TXM/p2/org.eclipse.equinox.p2.engine/profileRegistry/profile.profile/.data/.settings/*"
|
|
| 48 |
if [ $? != 0 ]; then |
|
| 49 |
echo "** $APP: failed to remove p2 preferences" |
|
| 50 |
exit 1; |
|
| 51 |
fi |
|
| 52 |
|
|
| 53 | 49 |
# copy eclise arch dependent build |
| 54 | 50 |
rsync -r --exclude '.svn' "exportRCP/linux.gtk.${ARCHCODE}/TXM" "$APP/usr/lib"
|
| 55 | 51 |
if [ $? != 0 ]; then |
| ... | ... | |
| 65 | 61 |
fi |
| 66 | 62 |
|
| 67 | 63 |
# for multi installation: set the package version to txm-$VERSION |
| 68 |
find "$APP/DEBIAN/preinst" -type f -exec sed -i "s/\/usr\/lib\/TXM/\/usr\/lib\/TXM_$VERSION/g" {} \;
|
|
| 69 |
find "$APP/DEBIAN/preinst" -type f -exec sed -i "s/\/usr\/bin\/TXM/\/usr\/bin\/TXM_$VERSION/g" {} \;
|
|
| 70 |
find "$APP/DEBIAN/preinst" -type f -exec sed -i "s/\/usr\/share\/TXM/\/usr\/share\/TXM_$VERSION/g" {} \;
|
|
| 71 |
find "$APP/DEBIAN/preinst" -type f -exec sed -i "s/\/usr\/share\/applications\/TXM.desktop/\/usr\/share\/applications\/TXM_$VERSION.desktop/g" {} \;
|
|
| 72 |
find "$APP/DEBIAN/preinst" -type f -exec sed -i "s/\/usr\/share\/applications\/TXM debug.desktop/\/usr\/share\/applications\/TXM_$VERSION debug.desktop/g" {} \;
|
|
| 64 |
find "$APP/DEBIAN/preinst" -type f -exec sed -i "s/\/usr\/lib\/TXM/\/usr\/lib\/TXM-$VERSION/g" {} \;
|
|
| 65 |
find "$APP/DEBIAN/preinst" -type f -exec sed -i "s/\/usr\/bin\/TXM/\/usr\/bin\/TXM-$VERSION/g" {} \;
|
|
| 66 |
find "$APP/DEBIAN/preinst" -type f -exec sed -i "s/\/usr\/share\/TXM/\/usr\/share\/TXM-$VERSION/g" {} \;
|
|
| 67 |
find "$APP/DEBIAN/preinst" -type f -exec sed -i "s/\/usr\/share\/applications\/TXM.desktop/\/usr\/share\/applications\/TXM-$VERSION.desktop/g" {} \;
|
|
| 68 |
find "$APP/DEBIAN/preinst" -type f -exec sed -i "s/\/usr\/share\/applications\/TXM debug.desktop/\/usr\/share\/applications\/TXM-$VERSION debug.desktop/g" {} \;
|
|
| 73 | 69 |
find "$APP/DEBIAN/preinst" -type f -exec sed -i "s/\/usr\/share\/doc\/txm/\/usr\/share\/doc\/txm-$VERSION/g" {} \;
|
| 74 | 70 |
find "$APP/DEBIAN/preinst" -type f -exec sed -i "s/\/usr\/share\/lintiant\/overrides\/txm/\/usr\/share\/lintiant\/overrides\/txm-$VERSION/g" {} \;
|
| 75 |
find "$APP/DEBIAN/postinst" -type f -exec sed -i "s/\/usr\/lib\/TXM/\/usr\/lib\/TXM_$VERSION/g" {} \;
|
|
| 71 |
find "$APP/DEBIAN/postinst" -type f -exec sed -i "s/\/usr\/lib\/TXM/\/usr\/lib\/TXM-$VERSION/g" {} \;
|
|
| 76 | 72 |
find "$APP/DEBIAN/postinst" -type f -exec sed -i "s/TXM\&/TXM-{VERSION}\&/g" {} \;
|
| 77 | 73 |
find "$APP/DEBIAN/control" -type f -exec sed -i "s/Package: txm/Package: txm-${VERSION}/g" {} \;
|
| 78 |
find "$APP/usr/bin/TXM" -type f -exec sed -i "s/\/usr\/lib\/TXM/\/usr\/lib\/TXM_$VERSION/g" {} \;
|
|
| 79 |
find "$APP/usr/bin/TXM" -type f -exec sed -i "s/\$HOME\/TXM/\$HOME\/TXM_$VERSION/g" {} \;
|
|
| 80 |
mv "$APP/usr/bin/TXM" "$APP/usr/bin/TXM_$VERSION"
|
|
| 81 |
mv "$APP/usr/lib/TXM" "$APP/usr/lib/TXM_$VERSION"
|
|
| 82 |
find "$APP/usr/share/applications/TXM.desktop" -type f -exec sed -i "s/\/usr\/share\/TXM/\/usr\/share\/TXM_$VERSION/g" {} \;
|
|
| 83 |
find "$APP/usr/share/applications/TXM.desktop" -type f -exec sed -i "s/\/usr\/bin\/TXM/\/usr\/bin\/TXM_$VERSION/g" {} \;
|
|
| 84 |
find "$APP/usr/share/applications/TXM debug.desktop" -type f -exec sed -i "s/\/usr\/share\/TXM/\/usr\/share\/TXM_$VERSION/g" {} \;
|
|
| 85 |
find "$APP/usr/share/applications/TXM debug.desktop" -type f -exec sed -i "s/\/usr\/bin\/TXM/\/usr\/bin\/TXM_$VERSION/g" {} \;
|
|
| 86 |
mv "$APP/usr/share/applications/TXM.desktop" "$APP/usr/share/applications/TXM_$VERSION.desktop"
|
|
| 87 |
mv "$APP/usr/share/applications/TXM debug.desktop" "$APP/usr/share/applications/TXM_$VERSION debug.desktop"
|
|
| 74 |
find "$APP/usr/bin/TXM" -type f -exec sed -i "s/\/usr\/lib\/TXM/\/usr\/lib\/TXM-$VERSION/g" {} \;
|
|
| 75 |
find "$APP/usr/bin/TXM" -type f -exec sed -i "s/\$HOME\/TXM/\$HOME\/TXM-$VERSION/g" {} \;
|
|
| 76 |
mv "$APP/usr/bin/TXM" "$APP/usr/bin/TXM-$VERSION"
|
|
| 77 |
mv "$APP/usr/lib/TXM" "$APP/usr/lib/TXM-$VERSION"
|
|
| 78 |
find "$APP/usr/share/applications/TXM.desktop" -type f -exec sed -i "s/\/usr\/share\/TXM/\/usr\/share\/TXM-$VERSION/g" {} \;
|
|
| 79 |
find "$APP/usr/share/applications/TXM.desktop" -type f -exec sed -i "s/\/usr\/bin\/TXM/\/usr\/bin\/TXM-$VERSION/g" {} \;
|
|
| 80 |
find "$APP/usr/share/applications/TXM debug.desktop" -type f -exec sed -i "s/\/usr\/share\/TXM/\/usr\/share\/TXM-$VERSION/g" {} \;
|
|
| 81 |
find "$APP/usr/share/applications/TXM debug.desktop" -type f -exec sed -i "s/\/usr\/bin\/TXM/\/usr\/bin\/TXM-$VERSION/g" {} \;
|
|
| 82 |
mv "$APP/usr/share/applications/TXM.desktop" "$APP/usr/share/applications/TXM-$VERSION.desktop"
|
|
| 83 |
mv "$APP/usr/share/applications/TXM debug.desktop" "$APP/usr/share/applications/TXM-$VERSION debug.desktop"
|
|
| 88 | 84 |
mv "$APP/usr/share/doc/txm" "$APP/usr/share/doc/txm-$VERSION" |
| 89 | 85 |
find "$APP/usr/share/lintian/overrides/txm" -type f -exec sed -i "s/txm binary/txm-$VERSION binary/g" {} \;
|
| 90 | 86 |
mv "$APP/usr/share/lintian/overrides/txm" "$APP/usr/share/lintian/overrides/txm-$VERSION" |
| 91 |
mv "$APP/usr/share/TXM" "$APP/usr/share/TXM_$VERSION"
|
|
| 87 |
mv "$APP/usr/share/TXM" "$APP/usr/share/TXM-$VERSION"
|
|
| 92 | 88 |
|
| 93 | 89 |
# build |
| 94 | 90 |
sudo fakeroot dpkg-deb --build "$APP" |
| tmp/org.txm.core.tests/src/org/txm/core/tests/junit/TXMPluginTest.java (revision 817) | ||
|---|---|---|
| 82 | 82 |
} |
| 83 | 83 |
|
| 84 | 84 |
/** |
| 85 |
* All Test must starts with "super.test();" Usually ou don't need to Override this method |
|
| 85 |
* All Test must starts with "super.test();" Usually you don't need to Override this method
|
|
| 86 | 86 |
*/ |
| 87 | 87 |
@Test |
| 88 | 88 |
public void test() {
|
| tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java (revision 817) | ||
|---|---|---|
| 937 | 937 |
|
| 938 | 938 |
// Query Area: query itself + view properties |
| 939 | 939 |
queryArea = new Composite(controlArea, SWT.NONE); |
| 940 |
queryArea.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, true));
|
|
| 940 |
queryArea.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
|
|
| 941 | 941 |
queryArea.setLayout(new GridLayout(4, false)); |
| 942 | 942 |
|
| 943 | 943 |
//////////////////////////////// |
| ... | ... | |
| 945 | 945 |
////////////////////////////////// |
| 946 | 946 |
|
| 947 | 947 |
navigationArea = new Composite(controlArea, SWT.NONE); |
| 948 |
navigationArea.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, true));
|
|
| 948 |
navigationArea.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
|
|
| 949 | 949 |
GridLayout navigationLayout = new GridLayout(7, false); |
| 950 | 950 |
navigationLayout.verticalSpacing = 0; |
| 951 | 951 |
navigationLayout.marginWidth = 0; |
| ... | ... | |
| 957 | 957 |
// Query: |
| 958 | 958 |
getMainParametersComposite().getLayout().numColumns = 2; |
| 959 | 959 |
// make |
| 960 |
getMainParametersComposite().setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
|
|
| 960 |
getMainParametersComposite().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
|
|
| 961 | 961 |
|
| 962 | 962 |
queryLabel = new Label(getMainParametersComposite(), SWT.NONE); |
| 963 | 963 |
queryLabel.setText(TXMUIMessages.CreateSubcorpusDialog_10); |
| ... | ... | |
| 966 | 966 |
// [ (v)] |
| 967 | 967 |
// queryWidget = new QueryWidget(queryArea, SWT.DROP_DOWN); |
| 968 | 968 |
queryWidget = new AssistedQueryWidget(getMainParametersComposite(), SWT.DROP_DOWN, concordance.getCorpus()); |
| 969 |
queryWidget.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
|
|
| 969 |
queryWidget.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
|
|
| 970 | 970 |
queryWidget.addKeyListener(new ComputeKeyListener(this)); |
| 971 | 971 |
|
| 972 | 972 |
// hide the parameters panel |
| ... | ... | |
| 1155 | 1155 |
navigationAreaComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); |
| 1156 | 1156 |
|
| 1157 | 1157 |
navigationWidget = new NavigationWidget(navigationAreaComposite, SWT.NONE); |
| 1158 |
navigationWidget.setLayoutData(new GridData(SWT.CENTER, SWT.FILL, true, false));
|
|
| 1158 |
navigationWidget.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, false));
|
|
| 1159 | 1159 |
|
| 1160 | 1160 |
// | [|<] [<] infos [>] [>|] | |
| 1161 | 1161 |
// [|<] |
Formats disponibles : Unified diff