Skip to content

Cleanup in imports #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dmatej wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Cleanup in imports #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c605d92
Removed spaces in imports before semicolon
dmatej Apr 22, 2026
59812ba
Fixed default target
dmatej Apr 22, 2026
6864191
Switched from hamcrest-all 1.3 to hamcrest 3.0
dmatej Apr 22, 2026
d2ebbf1
Yet imports with multiple spaces
dmatej Apr 22, 2026
9b04cb1
Organizing imports, removed asterisks and duplicities
dmatej Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 8 additions & 7 deletions ...tion-processor/src/main/java/org/glassfish/corba/annotation/processing/FileGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,19 @@

package org.glassfish.corba.annotation.processing;

import org.glassfish.pfl.basic.logex.ExceptionWrapper;
import org.glassfish.pfl.basic.logex.Message;
import java.io.IOException;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import javax.annotation.processing.Filer;
import javax.lang.model.element.Element;
import javax.tools.FileObject;
import javax.tools.StandardLocation;
import java.io.IOException;
import java.io.Writer;
import java.util.Date;
import java.util.ArrayList;
import java.util.List;

import org.glassfish.pfl.basic.logex.ExceptionWrapper;
import org.glassfish.pfl.basic.logex.Message;

/**
* This class generates properties files based on annotations.
Expand Down
24 changes: 12 additions & 12 deletions ...l-tests/src/test/java/com/sun/corba/ee/impl/activation/ORBConfiguratorPersistentImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,28 @@

package com.sun.corba.ee.impl.activation ;

import java.util.Collection ;
import java.util.Iterator ;
import java.util.Collection;
import java.util.Iterator;

import org.omg.CORBA.CompletionStatus ;
import org.omg.CORBA.CompletionStatus;

import com.sun.corba.ee.spi.activation.Locator ;
import com.sun.corba.ee.spi.activation.Activator ;
import com.sun.corba.ee.spi.activation.LocatorHelper ;
import com.sun.corba.ee.spi.activation.ActivatorHelper ;
import com.sun.corba.ee.spi.activation.EndPointInfo ;
import com.sun.corba.ee.spi.activation.Locator;
import com.sun.corba.ee.spi.activation.Activator;
import com.sun.corba.ee.spi.activation.LocatorHelper;
import com.sun.corba.ee.spi.activation.ActivatorHelper;
import com.sun.corba.ee.spi.activation.EndPointInfo;

import com.sun.corba.ee.spi.orb.ORBData ;
import com.sun.corba.ee.spi.orb.ORB ;
import com.sun.corba.ee.spi.orb.ORBData;
import com.sun.corba.ee.spi.orb.ORB;

import com.sun.corba.ee.spi.transport.SocketInfo;

import com.sun.corba.ee.spi.logging.ORBUtilSystemException ;
import com.sun.corba.ee.spi.logging.ORBUtilSystemException;

import com.sun.corba.ee.impl.orb.ORBConfiguratorImpl;
import com.sun.corba.ee.spi.legacy.connection.LegacyServerSocketEndPointInfo;

import com.sun.corba.ee.spi.misc.ORBConstants ;
import com.sun.corba.ee.spi.misc.ORBConstants;

public class ORBConfiguratorPersistentImpl extends ORBConfiguratorImpl {
private ORBUtilSystemException wrapper = ORBUtilSystemException.self ;
Expand Down
4 changes: 3 additions & 1 deletion functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ProcessMonitorThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@

package com.sun.corba.ee.impl.activation;

import java.util.*;
import com.sun.corba.ee.spi.misc.ORBConstants;

import java.util.Iterator;
import java.util.Map;

/** ProcessMonitorThread is started when ServerManager is instantiated. The
* thread wakes up every minute (This can be changed by setting sleepTime) and
* makes sure that all the processes (Servers) registered with the ServerTool
Expand Down
17 changes: 10 additions & 7 deletions functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,20 @@

package com.sun.corba.ee.impl.activation;

import com.sun.corba.ee.spi.activation.Activator;
import com.sun.corba.ee.spi.activation.ActivatorHelper;
import com.sun.corba.ee.spi.misc.ORBClassLoader;
import com.sun.corba.ee.spi.misc.ORBConstants;

import java.io.File;
import java.io.FileOutputStream;
import java.io.PrintStream;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.io.*;
import java.util.Date;
import java.util.Properties ;
import java.util.Properties;

import org.omg.CORBA.ORB ;
import com.sun.corba.ee.spi.activation.Activator ;
import com.sun.corba.ee.spi.activation.ActivatorHelper ;
import com.sun.corba.ee.spi.misc.ORBConstants ;
import com.sun.corba.ee.spi.misc.ORBClassLoader ;
import org.omg.CORBA.ORB;

/**
* @version 1.8, 99/11/02
Expand Down
24 changes: 12 additions & 12 deletions functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,22 @@
import com.sun.corba.ee.spi.activation.InvalidORBid;
import com.sun.corba.ee.spi.activation.Server;
import com.sun.corba.ee.spi.activation.IIOP_CLEAR_TEXT;
import com.sun.corba.ee.spi.ior.IORTemplate ;
import com.sun.corba.ee.spi.ior.TaggedComponent ;
import com.sun.corba.ee.spi.ior.IOR ;
import com.sun.corba.ee.spi.ior.ObjectKey ;
import com.sun.corba.ee.spi.ior.ObjectKeyTemplate ;
import com.sun.corba.ee.spi.ior.IORFactories ;
import com.sun.corba.ee.spi.ior.iiop.GIOPVersion ;
import com.sun.corba.ee.spi.ior.iiop.IIOPAddress ;
import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate ;
import com.sun.corba.ee.spi.ior.iiop.IIOPFactories ;
import com.sun.corba.ee.spi.ior.IORTemplate;
import com.sun.corba.ee.spi.ior.TaggedComponent;
import com.sun.corba.ee.spi.ior.IOR;
import com.sun.corba.ee.spi.ior.ObjectKey;
import com.sun.corba.ee.spi.ior.ObjectKeyTemplate;
import com.sun.corba.ee.spi.ior.IORFactories;
import com.sun.corba.ee.spi.ior.iiop.GIOPVersion;
import com.sun.corba.ee.spi.ior.iiop.IIOPAddress;
import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate;
import com.sun.corba.ee.spi.ior.iiop.IIOPFactories;
import com.sun.corba.ee.spi.legacy.connection.LegacyServerSocketEndPointInfo;
import com.sun.corba.ee.spi.orb.ORB ;
import com.sun.corba.ee.spi.orb.ORB;
import com.sun.corba.ee.spi.protocol.ForwardException;
import com.sun.corba.ee.spi.transport.TransportManager;

import com.sun.corba.ee.spi.logging.ActivationSystemException ;
import com.sun.corba.ee.spi.logging.ActivationSystemException;

import com.sun.corba.ee.impl.oa.poa.BadServerIdHandler;
import com.sun.corba.ee.spi.misc.ORBConstants;
Expand Down
2 changes: 1 addition & 1 deletion functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerTableEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import com.sun.corba.ee.spi.activation.RepositoryPackage.ServerDef;

import com.sun.corba.ee.spi.misc.ORBConstants;
import com.sun.corba.ee.spi.logging.ActivationSystemException ;
import com.sun.corba.ee.spi.logging.ActivationSystemException;

import java.util.HashMap;
import java.util.Map;
Expand Down
34 changes: 24 additions & 10 deletions functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,38 @@

package com.sun.corba.ee.impl.activation;

import com.sun.corba.ee.impl.misc.CorbaResourceUtil;
import com.sun.corba.ee.spi.activation.Activator;
import com.sun.corba.ee.spi.activation.ActivatorHelper;
import com.sun.corba.ee.spi.activation.BadServerDefinition;
import com.sun.corba.ee.spi.activation.EndPointInfo;
import com.sun.corba.ee.spi.activation.IIOP_CLEAR_TEXT;
import com.sun.corba.ee.spi.activation.InvalidORBid;
import com.sun.corba.ee.spi.activation.Locator;
import com.sun.corba.ee.spi.activation.LocatorHelper;
import com.sun.corba.ee.spi.activation.NoSuchEndPoint;
import com.sun.corba.ee.spi.activation.ORBPortInfo;
import com.sun.corba.ee.spi.activation.Repository;
import com.sun.corba.ee.spi.activation.RepositoryHelper;
import com.sun.corba.ee.spi.activation.ServerAlreadyActive;
import com.sun.corba.ee.spi.activation.ServerAlreadyRegistered;
import com.sun.corba.ee.spi.activation.ServerHeldDown;
import com.sun.corba.ee.spi.activation.ServerNotActive;
import com.sun.corba.ee.spi.activation.ServerNotRegistered;
import com.sun.corba.ee.spi.activation.LocatorPackage.ServerLocation;
import com.sun.corba.ee.spi.activation.LocatorPackage.ServerLocationPerORB;
import com.sun.corba.ee.spi.activation.RepositoryPackage.ServerDef;
import com.sun.corba.ee.spi.misc.ORBConstants;

import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.PrintStream;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import java.util.StringTokenizer;

import org.omg.CORBA.ORB;
import org.omg.CORBA.INITIALIZE;
import org.omg.CORBA.CompletionStatus;
import com.sun.corba.ee.spi.misc.ORBConstants;
import com.sun.corba.ee.impl.misc.CorbaResourceUtil;
import com.sun.corba.ee.spi.activation.*;
import com.sun.corba.ee.spi.activation.ServerHeldDown;
import com.sun.corba.ee.spi.activation.RepositoryPackage.ServerDef;
import com.sun.corba.ee.spi.activation.LocatorPackage.ServerLocation;
import com.sun.corba.ee.spi.activation.LocatorPackage.ServerLocationPerORB;

/**
*
Expand Down
13 changes: 8 additions & 5 deletions functional-tests/src/test/java/com/sun/corba/ee/impl/naming/pcosnaming/NameService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,19 @@

package com.sun.corba.ee.impl.naming.pcosnaming;

import com.sun.corba.ee.spi.misc.ORBConstants;
import com.sun.corba.ee.spi.orb.ORB;

import java.io.File;

import org.omg.CORBA.Policy;
import org.omg.CosNaming.NamingContext;
import org.omg.CosNaming.NamingContextHelper;
import org.omg.PortableServer.*;

import com.sun.corba.ee.spi.orb.ORB ;

import com.sun.corba.ee.spi.misc.ORBConstants ;
import org.omg.PortableServer.IdAssignmentPolicyValue;
import org.omg.PortableServer.LifespanPolicyValue;
import org.omg.PortableServer.POA;
import org.omg.PortableServer.RequestProcessingPolicyValue;
import org.omg.PortableServer.ServantRetentionPolicyValue;

/**
* @version 1.3, 00/04/06
Expand Down
45 changes: 24 additions & 21 deletions ...tional-tests/src/test/java/com/sun/corba/ee/impl/naming/pcosnaming/NamingContextImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,36 +19,39 @@

package com.sun.corba.ee.impl.naming.pcosnaming;


import org.omg.CORBA.Object;
import org.omg.CORBA.SystemException;
import org.omg.CORBA.BAD_PARAM;
import org.omg.CORBA.CompletionStatus;
import org.omg.CORBA.Policy;
import org.omg.PortableServer.POA;
import org.omg.PortableServer.LifespanPolicyValue;
import org.omg.PortableServer.IdAssignmentPolicyValue;
import org.omg.PortableServer.ServantRetentionPolicyValue;

import org.omg.CosNaming.*;
import org.omg.CosNaming.NamingContextPackage.*;

import com.sun.corba.ee.impl.naming.cosnaming.BindingIteratorImpl;
import com.sun.corba.ee.impl.naming.cosnaming.NamingContextDataStore;
import com.sun.corba.ee.impl.naming.cosnaming.NamingUtils;

import com.sun.corba.ee.impl.naming.namingutil.INSURLHandler;

import com.sun.corba.ee.spi.orb.ORB;

import com.sun.corba.ee.spi.misc.ORBConstants;
import com.sun.corba.ee.spi.logging.NamingSystemException;
import com.sun.corba.ee.spi.misc.ORBConstants;
import com.sun.corba.ee.spi.orb.ORB;
import com.sun.corba.ee.spi.trace.Naming;

import java.io.IOException;
import java.io.ObjectInputStream;

import java.io.Serializable;
import java.util.Hashtable;

import org.omg.CORBA.BAD_PARAM;
import org.omg.CORBA.Object;
import org.omg.CORBA.Policy;
import org.omg.CORBA.SystemException;
import org.omg.CosNaming.BindingIteratorHolder;
import org.omg.CosNaming.BindingListHolder;
import org.omg.CosNaming.BindingType;
import org.omg.CosNaming.BindingTypeHolder;
import org.omg.CosNaming.NameComponent;
import org.omg.CosNaming.NamingContext;
import org.omg.CosNaming.NamingContextExtPOA;
import org.omg.CosNaming.NamingContextHelper;
import org.omg.CosNaming.NamingContextPackage.InvalidName;
import org.omg.CosNaming.NamingContextPackage.NotFound;
import org.omg.CosNaming.NamingContextPackage.NotFoundReason;
import org.omg.PortableServer.IdAssignmentPolicyValue;
import org.omg.PortableServer.LifespanPolicyValue;
import org.omg.PortableServer.POA;
import org.omg.PortableServer.ServantRetentionPolicyValue;

/**
* Class NamingContextImpl implements the org.omg.CosNaming::NamingContext and
* NamingContextExt interface.
Expand Down
8 changes: 4 additions & 4 deletions functional-tests/src/test/java/com/sun/corba/ee/internal/CosNaming/BootstrapServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@

import java.io.File;

import com.sun.corba.ee.spi.orb.ORB ;
import com.sun.corba.ee.spi.orb.ORB;

import com.sun.corba.ee.spi.resolver.Resolver ;
import com.sun.corba.ee.spi.resolver.LocalResolver ;
import com.sun.corba.ee.spi.resolver.ResolverDefault ;
import com.sun.corba.ee.spi.resolver.Resolver;
import com.sun.corba.ee.spi.resolver.LocalResolver;
import com.sun.corba.ee.spi.resolver.ResolverDefault;

import com.sun.corba.ee.spi.misc.ORBConstants;

Expand Down
6 changes: 2 additions & 4 deletions functional-tests/src/test/java/corba/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,10 @@
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.util.Properties;

import org.omg.CORBA.ORB;
import org.omg.CosNaming.*;
import org.omg.CosNaming.NamingContextPackage.*;

import corba.framework.Controller;
import corba.framework.Options;
import com.sun.corba.ee.spi.misc.ORBConstants;

public class Client
{
Expand Down
7 changes: 3 additions & 4 deletions functional-tests/src/test/java/corba/adapteractivator/AdapterActivator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@

package corba.adapteractivator;

import test.Test;
import corba.framework.*;
import java.util.*;
import org.omg.CORBA.*;
import corba.framework.CORBATest;
import corba.framework.Controller;
import corba.framework.Options;

public class AdapterActivator extends CORBATest
{
Expand Down
8 changes: 4 additions & 4 deletions functional-tests/src/test/java/corba/adapteractivator/AdapterActivatorServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@

package corba.adapteractivator ;

import org.omg.PortableServer.POA ;
import org.omg.PortableServer.AdapterActivator ;
import org.omg.PortableServer.LifespanPolicyValue ;
import org.omg.PortableServer.IdAssignmentPolicyValue ;
import org.omg.PortableServer.POA;
import org.omg.PortableServer.AdapterActivator;
import org.omg.PortableServer.LifespanPolicyValue;
import org.omg.PortableServer.IdAssignmentPolicyValue;

import corba.framework.RTMConstants;
import org.omg.CORBA.LocalObject;
Expand Down
4 changes: 2 additions & 2 deletions functional-tests/src/test/java/corba/codeset/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

package corba.codeset;

import CodeSetTester.Verifier ;
import CodeSetTester.VerifierHelper ;
import CodeSetTester.Verifier;
import CodeSetTester.VerifierHelper;
import CodeSetTester.VerifierPackage.TestCharSeqHolder;
import CodeSetTester.VerifierPackage.TestWCharSeqHolder;
import java.util.Properties;
Expand Down
10 changes: 6 additions & 4 deletions functional-tests/src/test/java/corba/codeset/CodeSetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@

package corba.codeset;

import test.Test;
import corba.framework.*;
import java.util.*;
import com.sun.corba.ee.spi.misc.ORBConstants;
import org.omg.CORBA.*;

import java.util.Properties;

import corba.framework.CORBATest;
import corba.framework.Controller;
import corba.framework.Options;

/**
* Simple tests in GIOP 1.1 and 1.2 of chars and wstrings.
Expand Down
10 changes: 6 additions & 4 deletions functional-tests/src/test/java/corba/connectintercept_1_4/Common.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,15 @@

package corba.connectintercept_1_4;

import com.sun.corba.ee.spi.legacy.interceptor.IORInfoExt;
import com.sun.corba.ee.spi.legacy.interceptor.UnknownType;

import org.omg.CORBA.CompletionStatus;
import org.omg.CORBA.INTERNAL;
import org.omg.CORBA.ORB;
import org.omg.CosNaming.*;

import com.sun.corba.ee.spi.legacy.interceptor.IORInfoExt;
import com.sun.corba.ee.spi.legacy.interceptor.UnknownType;
import org.omg.CosNaming.NameComponent;
import org.omg.CosNaming.NamingContext;
import org.omg.CosNaming.NamingContextHelper;

public abstract class Common
{
Expand Down
Loading