Permalink
Browse files

Removed last references in plugin.xml to the old File and Project views.

  • Loading branch information...
mxia
mxia committed Oct 8, 2009
1 parent 6ae00cb commit a8ee8c0cb38f25c8b64e544519924a4fba050e21
@@ -1,50 +0,0 @@
-/**
- * This file Copyright (c) 2005-2008 Aptana, Inc. This program is
- * dual-licensed under both the Aptana Public License and the GNU General
- * Public license. You may elect to use one or the other of these licenses.
- *
- * This program is distributed in the hope that it will be useful, but
- * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
- * NONINFRINGEMENT. Redistribution, except as permitted by whichever of
- * the GPL or APL you select, is prohibited.
- *
- * 1. For the GPL license (GPL), you can redistribute and/or modify this
- * program under the terms of the GNU General Public License,
- * Version 3, as published by the Free Software Foundation. You should
- * have received a copy of the GNU General Public License, Version 3 along
- * with this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Aptana provides a special exception to allow redistribution of this file
- * with certain other free and open source software ("FOSS") code and certain additional terms
- * pursuant to Section 7 of the GPL. You may view the exception and these
- * terms on the web at http://www.aptana.com/legal/gpl/.
- *
- * 2. For the Aptana Public License (APL), this program and the
- * accompanying materials are made available under the terms of the APL
- * v1.0 which accompanies this distribution, and is available at
- * http://www.aptana.com/legal/apl/.
- *
- * You may view the GPL, Aptana's exception and additional terms, and the
- * APL in the file titled license.html at the root of the corresponding
- * plugin containing this source file.
- *
- * Any modifications to this file must keep this entire header intact.
- */
-package com.aptana.ide.core.ui.views;
-
-/**
- * A view which may be refreshed
- * @author Ingo Muschenetz
- *
- */
-public interface IRefreshableView
-{
- /**
- * refresh
- *
- * @deprecated (use refresh with passing in an object
- */
- void refresh();
-}
@@ -16,6 +16,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui.views,
org.eclipse.ui.forms,
org.eclipse.ui.browser,
+ org.eclipse.ui.navigator,
org.eclipse.jface.text,
com.aptana.ide.core,
com.aptana.ide.core.ui,
@@ -148,6 +148,7 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.internal.editors.text.EditorsPlugin;
import org.eclipse.ui.internal.editors.text.NonExistingFileEditorInput;
+import org.eclipse.ui.navigator.CommonViewer;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.ui.progress.UIJob;
import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
@@ -167,7 +168,6 @@
import com.aptana.ide.core.ui.CoreUIUtils;
import com.aptana.ide.core.ui.editors.ISaveAsEvent;
import com.aptana.ide.core.ui.editors.ISaveEvent;
-import com.aptana.ide.core.ui.views.IRefreshableView;
import com.aptana.ide.editors.UnifiedEditorsPlugin;
import com.aptana.ide.editors.actions.OpenDeclarationAction;
import com.aptana.ide.editors.formatting.UnifiedBracketInserterManager;
@@ -241,7 +241,7 @@
// private UnifiedBracketMatcher bracketMatcher;
private ArrayList<ISaveAsEvent> _saveAsListeners;
private ArrayList<ISaveEvent> _saveListeners;
- private IRefreshableView _fileExplorerView;
+ private CommonViewer _fileExplorerView;
// private TextColorer textColorer;
private IPreferenceStore _prefStore;
private IPartListener _partListener;
@@ -2699,24 +2699,21 @@ private void updateFileExplorer()
{
if (this._fileExplorerView == null)
{
- this._fileExplorerView = (IRefreshableView) CoreUIUtils.getViewInternal(
- "com.aptana.ide.js.ui.views.FileExplorerView", null); //$NON-NLS-1$
+ this._fileExplorerView = (CommonViewer) CoreUIUtils.getViewInternal(
+ "com.aptana.ide.ui.io.fileExplorerView", null); //$NON-NLS-1$
}
if (this._fileExplorerView == null)
{
return;
}
- final IRefreshableView view = this._fileExplorerView;
-
- Display display = Display.getDefault();
- display.asyncExec(new Runnable()
+ Display.getDefault().asyncExec(new Runnable()
{
public void run()
{
- view.refresh();
+ _fileExplorerView.refresh();
}
});
@@ -461,7 +461,7 @@ protected void execute(IProgressMonitor monitor) throws CoreException
try
{
- showView("com.aptana.ide.core.ui.AptanaNavigator", PlatformUI.getWorkbench().getActiveWorkbenchWindow()); //$NON-NLS-1$
+ showView("com.aptana.ide.ui.io.fileExplorerView", PlatformUI.getWorkbench().getActiveWorkbenchWindow()); //$NON-NLS-1$
}
catch (PartInitException e)
{
@@ -256,22 +256,6 @@
</extension>
<extension
point="org.eclipse.ui.menus">
- <menuContribution
- locationURI="toolbar:com.aptana.ide.core.ui.AptanaNavigator?after=additions">
- <command
- commandId="com.aptana.ide.pathtools.commands.openShell"
- icon="icons/shell.png"
- style="push">
- </command>
- </menuContribution>
- <menuContribution
- locationURI="toolbar:com.aptana.ide.js.ui.views.FileExplorerView?after=additions">
- <command
- commandId="com.aptana.ide.pathtools.commands.openShell"
- icon="icons/shell.png"
- style="push">
- </command>
- </menuContribution>
<menuContribution
locationURI="toolbar:com.aptana.ide.ui.io.fileExplorerView?after=additions">
<command
Binary file not shown.
Binary file not shown.
@@ -34,8 +34,8 @@ PreferencePage.Synchronization.name=Synchronization
Propertypage.Synchronization.name=Synchronization
navigatorContent.site.name = Site Connection Contents
-action.openConnection.label = Open FTP Transfer
-action.openConnection.tooltip = Opens the default connection editor with the current FTP site selected
+action.openConnection.label = Open File Transfer
+action.openConnection.tooltip = Opens the default connection editor with the selected FTP site as destination
category.sync.description = Synchronization Commands
category.sync.name = Synchronization
editor.connection.name = Connection Explorer

0 comments on commit a8ee8c0

Please sign in to comment.