Skip to content

Commit 69bb807

Browse files
Merge branch 'master' into master
2 parents 32ebcb3 + 968d4ce commit 69bb807

3 files changed

Lines changed: 20 additions & 42 deletions

File tree

bundles/org.eclipse.ui.workbench/.settings/.api_filters

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<component id="org.eclipse.ui.workbench" version="2">
3+
<resource path="eclipseui/org/eclipse/ui/IPageLayout.java" type="org.eclipse.ui.IPageLayout">
4+
<filter id="405864542">
5+
<message_arguments>
6+
<message_argument value="org.eclipse.ui.IPageLayout"/>
7+
<message_argument value="DEFAULT_FASTVIEW_RATIO"/>
8+
</message_arguments>
9+
</filter>
10+
<filter id="405901410">
11+
<message_arguments>
12+
<message_argument value="org.eclipse.ui.IPageLayout"/>
13+
<message_argument value="getEditorReuseThreshold()"/>
14+
</message_arguments>
15+
</filter>
16+
<filter id="405901410">
17+
<message_arguments>
18+
<message_argument value="org.eclipse.ui.IPageLayout"/>
19+
<message_argument value="setEditorReuseThreshold(int)"/>
20+
</message_arguments>
21+
</filter>
22+
</resource>
323
<resource path="eclipseui/org/eclipse/ui/ISharedImages.java" type="org.eclipse.ui.ISharedImages">
424
<filter id="405864542">
525
<message_arguments>

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/IPageLayout.java

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -176,15 +176,6 @@ public interface IPageLayout {
176176
*/
177177
float RATIO_MAX = 0.95f;
178178

179-
/**
180-
* The default fast view ratio width.
181-
*
182-
* @since 2.0
183-
* @deprecated discontinued support for fast views
184-
*/
185-
@Deprecated(forRemoval = true, since = "2023-12")
186-
float DEFAULT_FASTVIEW_RATIO = 0.3f;
187-
188179
/**
189180
* The default view ratio width for regular (non-fast) views.
190181
*
@@ -396,29 +387,6 @@ public interface IPageLayout {
396387
*/
397388
void setEditorAreaVisible(boolean showEditorArea);
398389

399-
/**
400-
* Returns the number of open editors before reusing editors or -1 if the
401-
* preference settings should be used instead.
402-
*
403-
* @return the number of open editors before reusing editors or -1 if the
404-
* preference settings should be used instead.
405-
*
406-
* @deprecated this always returns -1 as of Eclipse 2.1
407-
*/
408-
@Deprecated(forRemoval = true, since = "2023-12")
409-
int getEditorReuseThreshold();
410-
411-
/**
412-
* Sets the number of open editors before reusing editors. If &lt; 0 the user
413-
* preference settings will be used.
414-
*
415-
* @param openEditors the number of open editors
416-
*
417-
* @deprecated this method has no effect, as of Eclipse 2.1
418-
*/
419-
@Deprecated(forRemoval = true, since = "2023-12")
420-
void setEditorReuseThreshold(int openEditors);
421-
422390
/**
423391
* Sets whether this layout is fixed. In a fixed layout, layout parts cannot be
424392
* moved or zoomed, and the initial set of views cannot be closed.

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/e4/compatibility/ModeledPageLayout.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -309,11 +309,6 @@ public String getEditorArea() {
309309
return internalGetEditorArea();
310310
}
311311

312-
@Override
313-
public int getEditorReuseThreshold() {
314-
return -1;
315-
}
316-
317312
@Override
318313
public IPlaceholderFolderLayout getFolderForView(String id) {
319314
MPart view = findPart(perspModel, id);
@@ -359,11 +354,6 @@ public void setEditorAreaVisible(boolean showEditorArea) {
359354
eaRef.setToBeRendered(showEditorArea);
360355
}
361356

362-
@Override
363-
public void setEditorReuseThreshold(int openEditors) {
364-
// ignored, no-op, same as 3.x implementation
365-
}
366-
367357
@Override
368358
public void setFixed(boolean isFixed) {
369359
// perspModel.setFixed(isFixed);

0 commit comments

Comments
 (0)