Merge commit 'origin/R3_3_branch'

Conflicts:
	CHANGES
	cpp/demo/Freeze/backup/.depend
	cpp/demo/Freeze/bench/.depend
	cpp/demo/Freeze/casino/.depend
	cpp/demo/Freeze/customEvictor/.depend
	cpp/demo/Freeze/library/.depend
	cpp/demo/Freeze/phonebook/.depend
	cpp/demo/Freeze/transform/.depend
	cpp/demo/Glacier2/callback/.depend
	cpp/demo/Glacier2/chat/.depend
	cpp/demo/Ice/async/.depend
	cpp/demo/Ice/bidir/.depend
	cpp/demo/Ice/callback/.depend
	cpp/demo/Ice/converter/.depend
	cpp/demo/Ice/hello/.depend
	cpp/demo/Ice/invoke/.depend
	cpp/demo/Ice/latency/.depend
	cpp/demo/Ice/minimal/.depend
	cpp/demo/Ice/multicast/.depend
	cpp/demo/Ice/nested/.depend
	cpp/demo/Ice/nrvo/.depend
	cpp/demo/Ice/session/.depend
	cpp/demo/Ice/throughput/.depend
	cpp/demo/Ice/value/.depend
	cpp/demo/IceBox/hello/.depend
	cpp/demo/IceGrid/allocate/.depend
	cpp/demo/IceGrid/icebox/.depend
	cpp/demo/IceGrid/replication/.depend
	cpp/demo/IceGrid/sessionActivation/.depend
	cpp/demo/IceGrid/simple/.depend
	cpp/demo/IceStorm/clock/.depend
	cpp/demo/IceStorm/counter/.depend
	cpp/demo/IceStorm/replicated/.depend
	cpp/demo/IceStorm/replicated2/.depend
	cpp/demo/book/freeze_filesystem/.depend
	cpp/demo/book/lifecycle/.depend
	cpp/demo/book/printer/.depend
	cpp/demo/book/simple_filesystem/.depend
	cpp/src/Freeze/.depend
	cpp/src/FreezeScript/.depend
	cpp/src/Ice/.depend
	cpp/src/Ice/UdpTransceiver.cpp
	cpp/src/Ice/UdpTransceiver.h
	cpp/src/IceBox/.depend
	cpp/src/IceGrid/.depend
	cpp/src/IceGridLib/.depend
	cpp/src/IcePatch2/.depend
	cpp/src/IceStorm/.depend
	cpp/src/slice2freeze/.depend
	cpp/test/Freeze/complex/.depend
	cpp/test/Freeze/dbmap/.depend
	cpp/test/Freeze/evictor/.depend
	cpp/test/Freeze/oldevictor/.depend
	cpp/test/FreezeScript/dbmap/.depend
	cpp/test/FreezeScript/evictor/.depend
	cpp/test/Glacier2/attack/.depend
	cpp/test/Glacier2/dynamicFiltering/.depend
	cpp/test/Glacier2/router/.depend
	cpp/test/Glacier2/sessionControl/.depend
	cpp/test/Glacier2/ssl/.depend
	cpp/test/Glacier2/staticFiltering/.depend
	cpp/test/Ice/adapterDeactivation/.depend
	cpp/test/Ice/background/.depend
	cpp/test/Ice/binding/.depend
	cpp/test/Ice/checksum/.depend
	cpp/test/Ice/checksum/server/.depend
	cpp/test/Ice/custom/.depend
	cpp/test/Ice/exceptions/.depend
	cpp/test/Ice/facets/.depend
	cpp/test/Ice/faultTolerance/.depend
	cpp/test/Ice/gc/.depend
	cpp/test/Ice/hold/.depend
	cpp/test/Ice/inheritance/.depend
	cpp/test/Ice/interceptor/.depend
	cpp/test/Ice/location/.depend
	cpp/test/Ice/objects/.depend
	cpp/test/Ice/operations/.depend
	cpp/test/Ice/proxy/.depend
	cpp/test/Ice/retry/.depend
	cpp/test/Ice/servantLocator/.depend
	cpp/test/Ice/slicing/exceptions/.depend
	cpp/test/Ice/slicing/objects/.depend
	cpp/test/Ice/stream/.depend
	cpp/test/Ice/stringConverter/.depend
	cpp/test/Ice/timeout/.depend
	cpp/test/Ice/udp/.depend
	cpp/test/IceBox/configuration/.depend
	cpp/test/IceGrid/activation/.depend
	cpp/test/IceGrid/allocation/.depend
	cpp/test/IceGrid/deployer/.depend
	cpp/test/IceGrid/distribution/.depend
	cpp/test/IceGrid/replicaGroup/.depend
	cpp/test/IceGrid/replication/.depend
	cpp/test/IceGrid/session/.depend
	cpp/test/IceGrid/simple/.depend
	cpp/test/IceGrid/update/.depend
	cpp/test/IceSSL/configuration/.depend
	cpp/test/IceStorm/federation/.depend
	cpp/test/IceStorm/federation2/.depend
	cpp/test/IceStorm/rep1/.depend
	cpp/test/IceStorm/repgrid/.depend
	cpp/test/IceStorm/repstress/.depend
	cpp/test/IceStorm/single/.depend
	cpp/test/IceStorm/stress/.depend
	cpp/test/Slice/keyword/.depend
	cs/src/Ice/Instance.cs
	cs/src/IceSSL/ConnectorI.cs
	java/demo/book/simple_filesystem/Filesystem/DirectoryI.java
	java/demo/book/simple_filesystem/Filesystem/FileI.java
	java/src/IceInternal/TcpConnector.java
	java/src/IceSSL/ConnectorI.java
	py/modules/IcePy/.depend
	rb/src/IceRuby/.depend

1 files changed, 257 insertions, 0 deletions

diff --git a/eclipse/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/properties/SourceSelectionDialog.java b/eclipse/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/properties/SourceSelectionDialog.java
new file mode 100644
index 00000000000..ee8d18ca6a1
--- /dev/null
+++ b/eclipse/Slice2javaPlugin/src/com/zeroc/slice2javaplugin/properties/SourceSelectionDialog.java
@@ -0,0 +1,257 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+//
+// This plug-in is provided to you under the terms and conditions
+// of the Eclipse Public License Version 1.0 ("EPL"). A copy of
+// the EPL is available at http://www.eclipse.org/legal/epl-v10.html.
+//
+// **********************************************************************
+
+package com.zeroc.slice2javaplugin.properties;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.viewers.CheckStateChangedEvent;
+import org.eclipse.jface.viewers.CheckboxTreeViewer;
+import org.eclipse.jface.viewers.ICheckStateListener;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TreeSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.ui.dialogs.SelectionDialog;
+import org.eclipse.ui.model.WorkbenchContentProvider;
+import org.eclipse.ui.model.WorkbenchLabelProvider;
+
+class SourceSelectionDialog extends SelectionDialog
+{
+    // Do we allow multiple selections?
+    private boolean multiple = true;
+    
+    // the root element to populate the viewer with
+    private IProject root;
+
+    // the visual selection widget group
+    private CheckboxTreeViewer selectionGroup;
+    
+    // constants
+    private final static int SIZING_SELECTION_WIDGET_WIDTH = 400;
+
+    private final static int SIZING_SELECTION_WIDGET_HEIGHT = 300;
+
+    /**
+     * Creates a resource selection dialog rooted at the given element.
+     * 
+     * @param parentShell
+     *            the parent shell
+     * @param rootElement
+     *            the root element to populate this dialog with
+     * @param message
+     *            the message to be displayed at the top of this dialog, or
+     *            <code>null</code> to display a default message
+     */
+    public SourceSelectionDialog(Shell parentShell, IProject project, String message)
+    {
+        super(parentShell);
+        setTitle("Source Folder Selection");
+        root = project;
+        if(message != null)
+        {
+            setMessage(message);
+        }
+        else
+        {
+            setMessage("Select source folder:");
+        }
+    }
+    
+    public void setMultiple(boolean m)
+    {
+        multiple = m;
+    }
+    
+    /*
+     * (non-Javadoc) Method declared in Window.
+     */
+    protected void configureShell(Shell shell)
+    {
+        super.configureShell(shell);
+        //PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, IIDEHelpContextIds.RESOURCE_SELECTION_DIALOG);
+    }
+
+    public void create()
+    {
+        super.create();
+        initializeDialog();
+    }
+
+    /*
+     * (non-Javadoc) Method declared on Dialog.
+     */
+    @SuppressWarnings("unchecked")
+    protected Control createDialogArea(Composite parent)
+    {
+        // page group
+        Composite composite = (Composite) super.createDialogArea(parent);
+
+        // create the input element, which has the root resource
+        // as its only child
+        ArrayList input = new ArrayList();
+        input.add(root);
+
+        createMessageArea(composite);
+        
+        Tree tree = new Tree(composite, ((multiple) ? SWT.CHECK : SWT.SINGLE) | SWT.BORDER);
+        GridData data = new GridData(GridData.FILL_BOTH);
+        data.widthHint = SIZING_SELECTION_WIDGET_WIDTH;
+        data.heightHint = SIZING_SELECTION_WIDGET_HEIGHT;
+        tree.setLayoutData(data);
+        tree.setFont(parent.getFont());
+        
+        selectionGroup = new CheckboxTreeViewer(tree);
+        selectionGroup.setContentProvider(getResourceProvider(IResource.FILE | IResource.PROJECT));
+        selectionGroup.setLabelProvider(WorkbenchLabelProvider.getDecoratingWorkbenchLabelProvider());
+        selectionGroup.setInput(input);
+
+        selectionGroup.expandToLevel(2);
+        
+        return composite;
+    }
+
+    /**
+     * Returns a content provider for <code>IResource</code>s that returns only
+     * children of the given resource type.
+     */
+    private ITreeContentProvider getResourceProvider(final int resourceType)
+    {
+        return new WorkbenchContentProvider()
+        {
+            @SuppressWarnings("unchecked")
+            public Object[] getChildren(Object o)
+            {
+                if(o instanceof IContainer)
+                {
+                    IResource[] members = null;
+                    try
+                    {
+                        members = ((IContainer) o).members();
+                    }
+                    catch(CoreException e)
+                    {
+                        // just return an empty set of children
+                        return new Object[0];
+                    }
+
+                    // filter out the desired resource types
+                    ArrayList results = new ArrayList();
+                    for(int i = 0; i < members.length; i++)
+                    {
+                        if(members[i] instanceof IFolder)
+                        {
+                            results.add(members[i]);
+                        }
+                    }
+                    return results.toArray();
+                }
+                // input element case
+                if(o instanceof ArrayList)
+                {
+                    return ((ArrayList) o).toArray();
+                }
+                return new Object[0];
+            }
+        };
+    }
+
+    /**
+     * Initializes this dialog's controls.
+     */
+    @SuppressWarnings("unchecked")
+    private void initializeDialog()
+    {
+        getOkButton().setEnabled(false);
+        if(multiple)
+        {
+            selectionGroup.addCheckStateListener(new ICheckStateListener()
+            {
+                public void checkStateChanged(CheckStateChangedEvent event)
+                {
+                    if(!event.getChecked() && selectionGroup.getGrayed(event.getElement()))
+                    {
+                        selectionGroup.setChecked(event.getElement(), true);
+                    }
+                    else
+                    {
+                        int count = selectionGroup.getCheckedElements().length - getInitialElementSelections().size();
+                        getOkButton().setEnabled(count > 0);
+                    }
+                }
+            });
+
+            for(Iterator iter = getInitialElementSelections().iterator(); iter.hasNext(); )
+            {
+                IResource cur = (IResource)iter.next();
+                selectionGroup.setGrayChecked(cur, true);
+            }   
+        }
+        else
+        {
+            selectionGroup.addSelectionChangedListener(new ISelectionChangedListener()
+            {
+                public void selectionChanged(SelectionChangedEvent event)
+                {
+                    getOkButton().setEnabled(true);
+                }
+            });
+        }
+    }
+
+    /**
+     * The <code>ResourceSelectionDialog</code> implementation of this
+     * <code>Dialog</code> method builds a list of the selected resources for
+     * later retrieval by the client and closes this dialog.
+     */
+    @SuppressWarnings("unchecked")
+    protected void okPressed()
+    {
+        /*
+         * Iterator resultEnum = selectionGroup.getAllCheckedListItems();
+         * ArrayList list = new ArrayList(); while (resultEnum.hasNext()) {
+         * list.add(resultEnum.next()); } setResult(list);
+         */
+        ArrayList list = new ArrayList();
+        if(multiple)
+        {
+            Object[] objs = selectionGroup.getCheckedElements();
+            for(int i = 0; i < objs.length; ++i)
+            {
+                if(!selectionGroup.getGrayed(objs[i]))
+                {
+                    list.add(objs[i]);
+                }
+            }
+        }
+        else
+        {
+            TreeSelection obj = (TreeSelection)selectionGroup.getSelection();
+            if(!obj.isEmpty())
+            {
+                list.add(obj.getFirstElement());
+            }
+        }
+        setResult(list);
+        super.okPressed();
+    }
+}