Skip to content

Commit 2fa3419

Browse files
axmanaladaxmanalad
committed
Reverted merge changes.
This reverts commit 64e43eb, reversing changes made to 6b38790. The reason to revert merge changes is to let the workspace run correctly.
1 parent 64e43eb commit 2fa3419

File tree

11 files changed

+183
-12
lines changed

11 files changed

+183
-12
lines changed

‎ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntEditorPreferencePage.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
import org.eclipse.swt.graphics.RGB;
4949
import org.eclipse.swt.layout.GridData;
5050
import org.eclipse.swt.layout.GridLayout;
51-
import org.eclipse.swt.layout.TabFolderLayout;
5251
import org.eclipse.swt.widgets.Button;
5352
import org.eclipse.swt.widgets.Combo;
5453
import org.eclipse.swt.widgets.Composite;

‎ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntRuntimePreferencePage.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.eclipse.jface.preference.PreferencePage;
3030
import org.eclipse.swt.SWT;
3131
import org.eclipse.swt.layout.GridData;
32-
import org.eclipse.swt.layout.TabFolderLayout;
3332
import org.eclipse.swt.widgets.Button;
3433
import org.eclipse.swt.widgets.Composite;
3534
import org.eclipse.swt.widgets.Control;

‎ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/TabFolderLayout.java‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/*******************************************************************************
2+
* Copyright (c) 2000, 2005 IBM Corporation and others.
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
6+
* which accompanies this distribution, and is available at
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
10+
*
11+
* Contributors:
12+
* IBM Corporation - initial API and implementation
13+
*******************************************************************************/
14+
package org.eclipse.ant.internal.ui.preferences;
15+
16+
import org.eclipse.swt.SWT;
17+
import org.eclipse.swt.graphics.Point;
18+
import org.eclipse.swt.graphics.Rectangle;
19+
import org.eclipse.swt.widgets.Composite;
20+
import org.eclipse.swt.widgets.Control;
21+
import org.eclipse.swt.widgets.Layout;
22+
23+
public class TabFolderLayout extends Layout {
24+
25+
@Override
26+
protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) {
27+
if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT)
28+
return new Point(wHint, hHint);
29+
30+
Control[] children = composite.getChildren();
31+
int count = children.length;
32+
int maxWidth = 0, maxHeight = 0;
33+
for (int i = 0; i < count; i++) {
34+
Control child = children[i];
35+
Point pt = child.computeSize(SWT.DEFAULT, SWT.DEFAULT, flushCache);
36+
maxWidth = Math.max(maxWidth, pt.x);
37+
maxHeight = Math.max(maxHeight, pt.y);
38+
}
39+
40+
if (wHint != SWT.DEFAULT)
41+
maxWidth = wHint;
42+
if (hHint != SWT.DEFAULT)
43+
maxHeight = hHint;
44+
45+
return new Point(maxWidth, maxHeight);
46+
47+
}
48+
49+
@Override
50+
protected void layout(Composite composite, boolean flushCache) {
51+
Rectangle rect = composite.getClientArea();
52+
53+
for (Control element : composite.getChildren()) {
54+
element.setBounds(rect);
55+
}
56+
}
57+
}

‎ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.ant.ui; singleton:=true
5-
Bundle-Version: 3.9.600.qualifier
5+
Bundle-Version: 3.9.500.qualifier
66
Bundle-Activator: org.eclipse.ant.internal.ui.AntUIPlugin
77
Bundle-Vendor: %providerName
88
Bundle-Localization: plugin
@@ -31,7 +31,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)";resolution:=op
3131
org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
3232
org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
3333
org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
34-
org.eclipse.ui.editors;bundle-version="[3.19.0,4.0.0)";resolution:=optional,
34+
org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
3535
org.apache.ant;bundle-version="1.9.4",
3636
org.eclipse.ant.core;bundle-version="[3.2.0,4.0.0)",
3737
org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)",

‎team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.206.0,4.0.0)",
2121
org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)",
2222
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
2323
org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)",
24-
org.eclipse.ui.editors;bundle-version="[3.19.0,4.0.0)",
24+
org.eclipse.ui.editors;bundle-version="[3.5.0,4.0.0)",
2525
org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
2626
org.eclipse.compare.core;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
2727
org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)";resolution:=optional

‎team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import org.eclipse.swt.graphics.Image;
4646
import org.eclipse.swt.layout.GridData;
4747
import org.eclipse.swt.layout.GridLayout;
48-
import org.eclipse.swt.layout.TabFolderLayout;
4948
import org.eclipse.swt.widgets.Button;
5049
import org.eclipse.swt.widgets.Composite;
5150
import org.eclipse.swt.widgets.Control;

‎team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TabFolderLayout.java‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
/*******************************************************************************
2+
* Copyright (c) 2000, 2011 IBM Corporation and others.
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
6+
* which accompanies this distribution, and is available at
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
10+
*
11+
* Contributors:
12+
* IBM Corporation - initial API and implementation
13+
*******************************************************************************/
14+
package org.eclipse.compare.internal;
15+
16+
import org.eclipse.swt.SWT;
17+
import org.eclipse.swt.graphics.Point;
18+
import org.eclipse.swt.graphics.Rectangle;
19+
import org.eclipse.swt.widgets.Composite;
20+
import org.eclipse.swt.widgets.Control;
21+
import org.eclipse.swt.widgets.Layout;
22+
23+
public class TabFolderLayout extends Layout {
24+
25+
@Override
26+
protected Point computeSize (Composite composite, int wHint, int hHint, boolean flushCache) {
27+
if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT)
28+
return new Point(wHint, hHint);
29+
30+
Control [] children = composite.getChildren ();
31+
int count = children.length;
32+
int maxWidth = 0, maxHeight = 0;
33+
for (int i=0; i<count; i++) {
34+
Control child = children [i];
35+
Point pt = child.computeSize (SWT.DEFAULT, SWT.DEFAULT, flushCache);
36+
maxWidth = Math.max (maxWidth, pt.x);
37+
maxHeight = Math.max (maxHeight, pt.y);
38+
}
39+
40+
if (wHint != SWT.DEFAULT)
41+
maxWidth= wHint;
42+
if (hHint != SWT.DEFAULT)
43+
maxHeight= hHint;
44+
45+
return new Point(maxWidth, maxHeight);
46+
47+
}
48+
49+
@Override
50+
protected void layout (Composite composite, boolean flushCache) {
51+
Rectangle rect= composite.getClientArea();
52+
53+
Control[] children = composite.getChildren();
54+
for (Control c : children) {
55+
c.setBounds(rect);
56+
}
57+
}
58+
}

‎team/bundles/org.eclipse.jsch.ui/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.jsch.ui;singleton:=true
5-
Bundle-Version: 1.5.500.qualifier
5+
Bundle-Version: 1.5.400.qualifier
66
Bundle-Activator: org.eclipse.jsch.internal.ui.JSchUIPlugin
77
Bundle-Vendor: %providerName
88
Bundle-Localization: plugin

‎team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -498,9 +498,9 @@ else if(e.widget==keyGenerateRSA){
498498
BusyIndicator.showWhile(getShell().getDisplay(), () -> {
499499
try {
500500
if (__type == KeyPair.RSA) {
501-
_kpair[0] = KeyPair.genKeyPair(getJSch(), __type, 4096);
501+
_kpair[0] = KeyPair.genKeyPair(getJSch(), __type, 2048);
502502
} else {
503-
_kpair[0] = KeyPair.genKeyPair(getJSch(), __type, 3072);
503+
_kpair[0] = KeyPair.genKeyPair(getJSch(), __type);
504504
}
505505
} catch (JSchException e1) {
506506
_e[0] = e1;
@@ -513,9 +513,9 @@ else if(e.widget==keyGenerateRSA){
513513

514514
ByteArrayOutputStream out=new ByteArrayOutputStream();
515515
if (__type == KeyPair.RSA) {
516-
kpairComment = _type + "-4096"; //$NON-NLS-1$
516+
kpairComment = _type + "-2048"; //$NON-NLS-1$
517517
} else {
518-
kpairComment = _type + "-3072"; //$NON-NLS-1$
518+
kpairComment = _type + "-1024"; //$NON-NLS-1$
519519
}
520520
kpair.writePublicKey(out, kpairComment);
521521
out.close();

‎ua/org.eclipse.help.ui/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Export-Package: org.eclipse.help.ui,
1818
org.eclipse.help.ui.internal.util;x-friends:="org.eclipse.ua.tests",
1919
org.eclipse.help.ui.internal.views;x-friends:="org.eclipse.ui.cheatsheets,org.eclipse.ua.tests"
2020
Require-Bundle: org.eclipse.help.base;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
21-
org.eclipse.ui;bundle-version="[3.206.200,4.0.0)";visibility:=reexport,
21+
org.eclipse.ui;bundle-version="[3.206.0,4.0.0)";visibility:=reexport,
2222
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)";visibility:=reexport,
2323
org.eclipse.ui.forms;bundle-version="[3.5.0,4.0.0)"
2424
Bundle-RequiredExecutionEnvironment: JavaSE-17

0 commit comments

Comments
 (0)