fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduces visibility of internal fields/methods

Browse Source 
Reduces the visibility of all fields to private and create setters/getters
when necessary. Exceptions are fields with GuiSync as these need to be
public.

Reduces the visibility of internal methods to private/protected/default when possible.
This commit is contained in:
yueh
2015-10-08 15:42:42 +02:00
parent f054bd699b
commit e94a0cfccf
497 changed files with 7865 additions and 6908 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/PartBasicState.java
+24 -14
View File
@@ -47,12 +47,12 @@ public abstract class PartBasicState extends AEBasePart implements IPowerChannel
protected static final int POWERED_FLAG = 1;
protected static final int CHANNEL_FLAG = 2;
protected int clientFlags = 0; // sent as byte.
private int clientFlags = 0; // sent as byte.
public PartBasicState( final ItemStack is )
{
super( is );
this.proxy.setFlags( GridFlags.REQUIRE_CHANNEL );
this.getProxy().setFlags( GridFlags.REQUIRE_CHANNEL );
}
@MENetworkEventSubscribe
@@ -103,28 +103,28 @@ public abstract class PartBasicState extends AEBasePart implements IPowerChannel
{
super.writeToStream( data );
this.clientFlags = 0;
this.setClientFlags( 0 );
try
{
if( this.proxy.getEnergy().isNetworkPowered() )
if( this.getProxy().getEnergy().isNetworkPowered() )
{
this.clientFlags |= POWERED_FLAG;
this.setClientFlags( this.getClientFlags() | POWERED_FLAG );
}
if( this.proxy.getNode().meetsChannelRequirements() )
if( this.getProxy().getNode().meetsChannelRequirements() )
{
this.clientFlags |= CHANNEL_FLAG;
this.setClientFlags( this.getClientFlags() | CHANNEL_FLAG );
}
this.clientFlags = this.populateFlags( this.clientFlags );
this.setClientFlags( this.populateFlags( this.getClientFlags() ) );
}
catch( final GridAccessException e )
{
// meh
}
data.writeByte( (byte) this.clientFlags );
data.writeByte( (byte) this.getClientFlags() );
}
protected int populateFlags( final int cf )
@@ -137,10 +137,10 @@ public abstract class PartBasicState extends AEBasePart implements IPowerChannel
{
final boolean eh = super.readFromStream( data );
final int old = this.clientFlags;
this.clientFlags = data.readByte();
final int old = this.getClientFlags();
this.setClientFlags( data.readByte() );
return eh || old != this.clientFlags;
return eh || old != this.getClientFlags();
}
@Override
@@ -153,12 +153,22 @@ public abstract class PartBasicState extends AEBasePart implements IPowerChannel
@Override
public boolean isPowered()
{
return ( this.clientFlags & POWERED_FLAG ) == POWERED_FLAG;
return ( this.getClientFlags() & POWERED_FLAG ) == POWERED_FLAG;
}
@Override
public boolean isActive()
{
return ( this.clientFlags & CHANNEL_FLAG ) == CHANNEL_FLAG;
return ( this.getClientFlags() & CHANNEL_FLAG ) == CHANNEL_FLAG;
}
public int getClientFlags()
{
return this.clientFlags;
}
private void setClientFlags( final int clientFlags )
{
this.clientFlags = clientFlags;
}
}